Revert "cleanup"

This reverts commit d8f7c7720dc7812e5289aa1a4b28c10bb25c2e42.
Fix cleanup