Cleanup in preparation for merge