clean up
put configuration is right place