Merge "Delete dead code." into nyc-dev