Remove all the deprecated code.
Merge pull request #553 from apenney/remove-deprecated

Remove all the deprecated code.