Removed most deprecated methods
Merge pull request #3025 from jroper/delete-deprecated

Removed most deprecated methods