Simplifies config file
Cleanup
Cleanup