Revert "Small Patch Test with minor cleanup."

This reverts commit cc14328a6c839c5902fe243ee780a26cdf2d866f.