vendorsetup: cleanup

Change-Id: I15bffae667c0d052274c538fe554de260679942a