Fix dispatch method not cleaning up dispatched notifications