cleaning up config
more cleanup