Revert "Clean up"

This reverts commit 1cc41362a7edf90dbaecc19a8334832e626d1877.