Revert "Revert "Cleanup""

This reverts commit 2a4c664f4cd19d2ced1be4373aac178088b27013.