cleanup again

Change-Id: Id42adc43ad98b55c22f37151d08db42469179d81