Config changes...
Removed unused references.
Config fixes.