Refactor deletion of nodes so gerrit watch does not know anything about it