Remove extra crap