Cleanups and fixes

Removing some autogenerate/autocopied files.

TODO: Replace shave with standard autofoo macros