Removed unused configuration variables.
Merge branch 'dev' into test