Removed unnecessary code from _Measurement