picked up the configuration code to make some changes

removed the duplicate config option
adding an assert for the values set in the configuration

Change-Id: I814065b946b616533615e28fd8f23204a33bda50