fixed remove callback