fix(config) clean up and fix configuration