Clean up some crap