Checkpoint
Clean up command runner
Checkpoint