Revert "Clean it all!"

This reverts commit a04ad802bfe3ce6a3e369a603374383c57ba2705.