RemoveCommand not needed.
Fixed CancelCommand.