Clean up Dispatcher