remove some unnecessary deref'ing