Remove indirection