proposed change as intermediate step to OMX v3, 

I only removed ObservationSet.Target (as well as some unused fields).