Removed all deprecated methods except one, and one undocumented class method left. Down to two warnings