Merge "cold sim clean up" into nyc-mr1-dev