Removed some deprecated code