Missed 1.8 update

Forgot to uncomment this after the C2 update.
Remove various unused imports

We do this too much
Fix some code, leave TODO notes

Lots of little things to be worked on, some of them I have worked on
now.
Fix some code, leave TODO notes part 2

Github decided to not do this all at once, who am I to argue with the
mystical overlord Github?