Merge "Remove dead code that could have a memory leak" into nyc-mr1-dev