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