Merge "Removed all the references to deprecated class" into nyc-dev