Cleaned up MeasurementController