Remove unsupported vendors & cleanup

Change-Id: I1ca1a2e6aea813f5cec359f5f6bece8522acb677