Revert "Additional cleanup"

This reverts commit 53f796543133e3cdda8f1207b7132bf5cfed2abb.