[CB,HB]{other} Some configuration clean up