Deprecated code removed