Remove superfluous code from the old CLI dispatcher