fix remove and dispatch methods