Revert "Clean up"

This reverts commit 4e85af790c2ff6175e6984f579d6424a76842ee9.