A couple Config cleanups.

Removed some auto-generated stuff.