vendor cleanup

Change-Id: I403cfd58636202c45558d00cad61cc338bc58426