Deleted some deprecated code