Cleanup.

Keep a base config, add the extra info in a seperate script.