Revert "Clean up"

This reverts commit f5287a2b98b554117c6333b5044ffd54cedc6533.
Clean up