0005031: Function 'getVendorTree' is missing: code cleanup (cherry picked from commit c60ef9c)