Revert "Don't delete things, makes it hard to test from outside"

This reverts commit 7cfe6e435cd7109a49ba8f20e4f5182d4cfbee86.