Remove artifacts of flailing

Change-Id: Ie8bb150a216263adc53131b4a9d391f4d50f4e20