Remove some unnecessary copies/clone