Move some configuration to a new place
Unused configuration
Moved other bits of config
Whitespace changes only