remove deprecated method
Merge branch 'master' into 2.0.x
test fixes. ALL TESTS PASS!