remove deprecated
removing more deprecated code