Merge pull request #842 from tphoney/remove_unsupported_code