Remove more warnings.

Mostly of the 'unused imports' kind.

I'm unsure about the 'no unsafe' bit, but that's what it says...