Revert "Revert "cleanup""

This reverts commit 214e4f7de74e713e479e3d6919de4735711148fa.