cleanup for 8)

Change-Id: I74ced39c005444987c3d85f3f629315783443816