Revert "Cleanup"

This reverts commit 85df954eebdd2bca937e9c17d3cee66be7d11cac.