Revert "correct previous commit and remove the actual removal from cleanup"

This reverts commit 6f6f6d4a170855e40aa5a6fe1cf680ba033b1f0a.