Fix remove callback