removing more deprecated code