Remove deprecated code
Merge pull request #1518 from erwinwinder/master

Remove deprecated code