Removed old style vendor options parsing