remove dependence on ADsafe