Remove the old dispatcher