Revert "Cleanup"

This reverts commit c188ee94c42cba3defd2bfab908d74d5955cb89e.