more configuration clean up