Removed couple of unused options from config; cleanup of the example gonfig files
Merge branch 'u/salnikov/DM-1055'