Remove unnecessary clearing step.
Add single step mode for debugging purposes.