Revert "Cleanup and Tweak More"

This reverts commit 5cdb5302c206f0b4214f314445327c62b464c65d

Change-Id: Ic3c9453a904463c4cac33e0e2b47d9f3d2cd9f90