Remove dumb indirection