further configuration clean up