Measurements cleanup