cleanup measurements.cc