More cleanup & revert some changes for now

Change-Id: I93ddc6665898a4632b3928146b8f0db2688cb3e8