Revert "Clean up"

This reverts commit 79c35ba5045926868e0406b03649d5b3749cef69.