Make load of VendorIdentifiers go faster. Makes server startup faster
remove dead code