Cleanup

Change-Id: Ia2ebcad4698f7abd40c8c6a2a4679411cd4aa39d