more cleanup in config