Cleaning up some crap