you're right, cleanupAndDelete will already handle removal.