remove unneeded indirection