Deleted deprecated code