Cleaning up more crap