more cleanup, config change