Once we have nailed the relationship mentioned in #82, we should make removeQueuedCommand() accept the command/promise as parameter.