Final cleanup

Change-Id: I50eeb2be87662f7478b602767e19611cf16d6930