Cleaning up some autogenerated stuff