Remove extra configs, cleanup