Revert "Revert "cleanup""

This reverts commit 9983b5f747c8d492660e33bbd1a587f6ce3b71c7.