Clean up some of the autogenerated content