clean up 2

Change-Id: I09bc2fbee3f65a020359e5ae2f70a9cc34dc5391