Remove the deprecated methods.
Merge pull request #3320 from natural-law/develop

Remove the deprecated methods.