add new config and cleanup