Remove some comments
Simpler Undo and Redo