Fixed handoff for vms.
Demo of delete fix on vms.
Fixed deletes.
Merge branch 'delete-fix' into test
Improved handoff behaviour.
Merge branch 'handoff-fix' into test