remove callback better