Revert "Clean up"

This reverts commit b3e3685b5785cac3f3d4ce742964f0bc694e6b97.