shedding deprecated code