Cleanup config file and comments