Egamma remove redundant std opt

As pointed out by @christos it is kind of overkill to wrap a unique_ptr in an optional as the validity of a ptr can be found by comparing it to null.