Cleanup r211507