Merge "Remove deprecated methods / classes" into nyc-dev