vendor: Cleanup

Change-Id: Ibe7d0915c8d9e7a0c625ae31c18883864fecf402