MeasureFakeRate2 : some major cleanup