Merge "Remove obsolete TODO" into nyc-dev