Removed some deprecated code
Merge pull request #1577 from alex/remove-deprecated

Removed some deprecated code