cleanup
new configuration framework