Some cleanups

Lolwhat?