removed dispatcher indirection