diff --git a/content/html/content/public/nsIFormControl.h b/content/html/content/public/nsIFormControl.h
index 82c89d7c8f1..2331ae422d6 100644
--- a/content/html/content/public/nsIFormControl.h
+++ b/content/html/content/public/nsIFormControl.h
@@ -48,8 +48,6 @@ class nsFormSubmission;
 enum FormControlsTypes {
   NS_FORM_FIELDSET = 1,
   NS_FORM_LABEL,
-  NS_FORM_OPTION,
-  NS_FORM_OPTGROUP,
   NS_FORM_OUTPUT,
   NS_FORM_SELECT,
   NS_FORM_TEXTAREA,
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index a03043a111a..89586d92c6b 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -2725,8 +2725,6 @@ nsGenericHTMLFormElement::IsLabelableControl() const
   PRInt32 type = GetType();
   return type != NS_FORM_FIELDSET &&
          type != NS_FORM_LABEL &&
-         type != NS_FORM_OPTION &&
-         type != NS_FORM_OPTGROUP &&
          type != NS_FORM_OBJECT;
 }
 
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index c1573f62934..435f69ededb 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -202,8 +202,6 @@ ShouldBeInElements(nsIFormControl* aFormControl)
   //
   // NS_FORM_INPUT_IMAGE
   // NS_FORM_LABEL
-  // NS_FORM_OPTION
-  // NS_FORM_OPTGROUP
 
   return PR_FALSE;
 }
diff --git a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
index 82576388dd2..789e5d08acc 100644
--- a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+++ b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
@@ -224,10 +224,6 @@ EmbedContextMenuInfo::SetFormControlType(nsIDOMEventTarget *originalTarget)
         break;
       case NS_FORM_LABEL:
         break;
-      case NS_FORM_OPTION:
-        break;
-      case NS_FORM_OPTGROUP:
-        break;
       case NS_FORM_SELECT:
         break;
       case NS_FORM_TEXTAREA: