Revert "Clean up"

This reverts commit ccf4564e1f336339d438201eb4c9d0fbf16bff67.