diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index 87e982deb0..0606341043 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -667,27 +667,6 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                 html += "\" id=\"search-widget-container" + modifier + "\">\n";
             }
 
-            // html += "<div class=\"input-group input-group-sm";
-            // html += "\">\n";
-            // html += "<div class=\"input-group-btn dropdown\">\n";
-            // html += "<button type=\"button\" ";
-            // html += "id=\"search_field_ddown\" ";
-            // html += "class=\"btn btn-default dropdown-toggle List-searchDropdown\" data-toggle=\"dropdown\"";
-            // html += ">\n";
-            // html += "<span ng-bind=\"" + iterator + "SearchFieldLabel" + modifier + "\"></span>\n";
-            // html += "<span class=\"caret\"></span>\n";
-            // html += "</button>\n";
-            // html += "<ul class=\"dropdown-menu\" id=\"" + iterator + "SearchDropdown" + modifier + "\">\n";
-            // html += addSearchFields(i);
-            // html += "</ul>\n";
-            // html += "</div><!-- input-group-btn -->\n";
-
-            // html += "<select id=\"search_value_select\" ng-show=\"" + iterator + "SelectShow" + modifier + "\" " +
-            //     "ng-model=\"" + iterator + "SearchSelectValue" + modifier + "\" ng-change=\"search('" + iterator + "')\" ";
-            // html += "ng-options=\"c.name for c in " + iterator + "SearchSelectOpts track by c.value" + modifier + "\" class=\"form-control search-select";
-            // html += "\"></select>\n";
-
-
             html += "<input id=\"search_value_input\" type=\"text\" ng-hide=\"" + iterator + "SelectShow" + modifier + " || " +
                 iterator + "InputHide" + modifier + "\" " +
                 "class=\"form-control List-searchInput\" ng-model=\"" + iterator + "SearchValue" + modifier + "\" " +
@@ -695,14 +674,6 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                 "InputDisable" + modifier + " || " + iterator + "HoldInput" + modifier + "\" ng-keypress=\"startSearch($event,'" +
                 iterator + "')\">\n";
 
-            // Reset button for drop-down
-            // html += "<div class=\"input-group-btn\" ng-show=\"" + iterator + "SelectShow" + modifier + "\" >\n";
-            // html += "<button type=\"button\" class=\"btn btn-default btn-small\" id=\"search-reset-button\" ng-click=\"resetSearch('" + iterator + "')\" " +
-            //     "aw-tool-tip=\"Clear the search\" data-placement=\"top\"><i class=\"fa fa-times\"></i></button>\n";
-            // html += "</div><!-- input-group-btn -->\n";
-
-            // html += "</div><!-- input-group -->\n";
-
             html += "<a class=\"search-reset-start List-searchInputIcon\" id=\"search-reset-button\" ng-click=\"resetSearch('" + iterator + "')\"" +
                 "ng-hide=\"" + iterator + "SelectShow" + modifier + " || " + iterator + "InputHide" + modifier + " || " +
                 iterator + "ShowStartBtn" + modifier + " || " +