Revert "Clean up"

This reverts commit 4605218787d9476af5bada8d2d9e66dff5a82dc7.