Interface change on IInstrument. Cleanup in measurement selection