Remove some extraneous crap