Clean up all this crap