Full removal of dependence on the dispatcher project.