Removes some dead code as a prereq for API work

Unused members and imports, some deprecations.

Shout if you see anything controversial.