cleanup
Tested this config version, seems to work.