delete + change assertions in Executor + add skeleton of Undo functions