Revert "More code clean up."

This reverts commit e2b78a75c7c5cc0ce4604eb16a321c67b1b409c9.