Revert "Clean up"

This reverts commit 8cf223214ab84b94aea1244ac7d458767bf93921.