Merge "Remove redundant code" into nyc-mr1-dev