Revert "Clean leftovers"

This reverts commit 72101faf5b5f0884266dc03599102de4a9a681e9.