cleanup the //trace ?