Some dispatcher code cleaning