fixing callback removal.