removing deprecated code