Remove un-needed crap