Updated dispatcher

-removed deprecated variables