Cleanup

Variety of small cleanup changes to generated files along with one copy change.