Removed some deprecated code
2 files changed