Updated config
Added some comments for the config
Removed legacy configuration options