diff --git a/gen/descriptors.py b/gen/descriptors.py
index cd1b2ea..6ab2c0b 100644
--- a/gen/descriptors.py
+++ b/gen/descriptors.py
@@ -443,12 +443,6 @@ class ToolClassDescriptor(ClassDescriptor):
         '''Adds, for class p_classDescr, attributes related to the search
            functionality for class p_classDescr.'''
         className = classDescr.name
-        # Field that defines if advanced search is enabled for class
-        # p_classDescr or not.
-        fieldName = 'enableAdvancedSearchFor%s' % className
-        fieldType = gen.Boolean(default=True, page='userInterface',
-                                group=classDescr.klass.__name__)
-        self.addField(fieldName, fieldType)
         # Field that defines how many columns are shown on the custom search
         # screen.
         fieldName = 'numberOfSearchColumnsFor%s' % className
diff --git a/gen/model.py b/gen/model.py
index 7173472..c61acc5 100644
--- a/gen/model.py
+++ b/gen/model.py
@@ -211,8 +211,7 @@ setattr(Page, Page.pages.back.attribute, Page.pages.back)
 # The Tool class ---------------------------------------------------------------
 # Prefixes of the fields generated on the Tool.
 toolFieldPrefixes = ('podTemplate', 'formats', 'resultColumns',
-                     'enableAdvancedSearch', 'numberOfSearchColumns',
-                     'searchFields')
+                     'numberOfSearchColumns', 'searchFields')
 defaultToolFields = ('title', 'mailHost', 'mailEnabled', 'mailFrom',
                      'appyVersion', 'dateFormat', 'hourFormat', 'users',
                      'connectedUsers', 'groups', 'translations',
diff --git a/gen/po.py b/gen/po.py
index 5df7308..ad7d663 100644
--- a/gen/po.py
+++ b/gen/po.py
@@ -222,7 +222,6 @@ CONFIG = "Configuration panel for product '%s'"
 MSG_podTemplate = "POD template for field '%s'"
 MSG_formats = "Output format(s) for field '%s'"
 MSG_resultColumns = "Columns to display while showing query results"
-MSG_enableAdvancedSearch = "Enable advanced search"
 MSG_numberOfSearchColumns = "Number of search columns"
 MSG_searchFields = "Search fields"
 POD_ASKACTION = 'Trigger related action'
diff --git a/gen/wrappers/ToolWrapper.py b/gen/wrappers/ToolWrapper.py
index 9ca5a6a..3706f3d 100644
--- a/gen/wrappers/ToolWrapper.py
+++ b/gen/wrappers/ToolWrapper.py
@@ -101,10 +101,6 @@ class ToolWrapper(AbstractWrapper):
                Stores the list of columns that must be shown when displaying
                instances of a given root p_klass.
 
-           "enableAdvancedSearch"
-               Determines if the advanced search screen must be enabled for
-               p_klass.
-
            "numberOfSearchColumns"
                Determines in how many columns the search screen for p_klass
                is rendered.