Clean up VendorBase (virtual) member functions further

Change-Id: If6b9355c6992eb6651f71c0944a93af0856ef1c7