Measure: remove obsoleted code