Remove unused imports and members.
Rename a few classes.