Removing unused files. Old XXXDispatcher.
Fixing wrong include.