Random clean up.
Seriously? (Again)