clean up dispatcher a touch