I ran some tests again and the cleanup works as expected.