Cleanup after upstream merge