Merge pull request #362 from dbaio/master

Remove obsolete config options