Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev am: 4f858aaa5a
am: d509acbf45

* commit 'd509acbf45a5f9af931c50dc0e69cc99c876e648':
  Revert "Revert "Remove deprecated methods / classes""