vendor cleanup

Change-Id: Icaf603c72612d9c50d06f6391ba189c50af1f356