Merge "CTS Test Metrics: Nuke deprecated code with fire!" into nyc-dev