Merge "remove removed class" into nyc-dev