Cleaning up various things that were autogenerated.