Cleanup in configs and routes