Revert "Revert "cleanup""

This reverts commit f927ddaecb5a7c32ecb631aa4ec24857bb94c120.