remove some uneccessary indirection