Revert "Clean up might have failed?"

This reverts commit 5e3ff31576eb05a9cde86ad98fb2e5951bb88d60.
Revert "Clean up and looking nicer"

This reverts commit 618d5e262c31a9e14ec606dfae532b5e9351f957.