trying to remove some unnecessary adapt<> usage