Callback removal fixup