cleaning up from upstream merge