Some more cleanups / obsolete code removals.

Change-Id: I584144ceeeedafdb114266d8a6d2513e67b1d010