Cleanup of config
Merge pull request #2 from javaBin/ems

Cleanup of config