do some clean

Change-Id: I59cf232db382891b875cfc0e2f6c3479abc23899