Cleanup some autogenerated crap