Basic cleanup on config
Merge pull request #903 from darkwing/config-cleanup

Basic cleanup on config