small changes to System Measure
removed extra files