Merge "Remove obsolete file" into nyc-dev