Some cleanup.

I like compiles without warnings.