Cleans up dead code, unused imports, deprecations.
removing 2.10 dead weight
Merge pull request #741 from huitseeker/issue/API

Some cleanup & 2.10 deprecation upheaval