Cleanup Dispatcher inheritance