Revert "Clean up"

This reverts commit 7796969cef20aab8cc29339f84299c1e73c6708a.