Removes two accesses to deprecated code.