Revert "Clean up"

This reverts commit 64107867ece563ff9f716a4e84a4f9067b857cbb.
Clean up again.