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