More cleanup

Change-Id: Iad552873247a11c8b2133bb1245bf7a3463f7039