remove too much indirection