Follow-up to issue #1940278.
Delete nodes on cleanup.