* code quality fixes * remove unnecessary code * Remove comment * change config entry configuration order * update based on aladdin connect pr
* code quality fixes * remove unnecessary code * Remove comment * change config entry configuration order * update based on aladdin connect pr