Remove ArrangeMeasure
Removed some comments