Major cleanup.
Removed the cancel boolean from all commands.