diff --git a/include/application.php b/include/application.php
index cae6d52..831de34 100644
--- a/include/application.php
+++ b/include/application.php
@@ -882,10 +882,8 @@ class Application {
     {
         $oUser = new user($this->iSubmitterId);
         $oVendor = new vendor($this->iVendorId);
-        if(!$oVendor->sName)
-            $sVendor = get_vendor_from_keywords($this->sKeywords);
-        else
-            $sVendor = $oVendor->objectMakeLink();
+
+        $sVendor = $oVendor->objectMakeLink();
 
         $oTableRow = new TableRow();
         $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
@@ -1115,11 +1113,4 @@ class Application {
     }
 }
 
-function get_vendor_from_keywords($sKeywords)
-{
-    $aKeywords = explode(" *** ",$sKeywords);
-    $iLastElt = (sizeOf($aKeywords)-1);
-    return($aKeywords[$iLastElt]);
-}
-
 ?>
diff --git a/include/application_queue.php b/include/application_queue.php
index 95e0529..3aa82cb 100644
--- a/include/application_queue.php
+++ b/include/application_queue.php
@@ -178,14 +178,6 @@ class application_queue
 
             $this->oApp->outputEditor();
 
-            /* We need to accept vendors submitted using the old
-               keyword hack.  This should be removed soon */
-            if(!$this->oVendor->sName && $this->oApp->iAppId)
-            {
-                $this->oVendor->sName = get_vendor_from_keywords(
-                    $this->oApp->sKeywords);
-            }
-
             /* Display the new vendor form for new applications or if we
                are processing an application and the vendor is queued */
             if(!$this->oApp->iAppId || $this->oVendor->sQueued != "false")