Dispatcher cleanup