Clean up: pass #2.
Revert "Clean up: pass #2."

This reverts commit 47e5150409111c072d5d126b74c3b65e20268155.
Clean up: pass #2