Revert "Revert "Additional cleanup""

This reverts commit 5bfedfcea8f6d301eff74a5a5554993ad852fb22.