Removed criticised code from annex 1
Fixed wrong handling of cancel command

Fixes #261: cancel all" crashs often director