diff --git a/platform/features/search/bundle.json b/platform/features/search/bundle.json
index f34a00df50..4778428e11 100644
--- a/platform/features/search/bundle.json
+++ b/platform/features/search/bundle.json
@@ -13,17 +13,12 @@
                 "implementation": "controllers/SearchItemController.js",
                 "depends": [ "$scope" ]
             }
-        ],        
-        "controls": [
-            {
-                "key": "searchbar-control",
-                "templateUrl": "templates/searchbar.html"
-            }
         ],
         "templates": [
             {
                 "key": "search",
-                "templateUrl": "templates/search.html"
+                "templateUrl": "templates/search.html",
+                "uses": [ "controls", "forms" ]
             }
         ],
         "representations": [
diff --git a/platform/features/search/res/templates/searchbar.html b/platform/features/search/res/templates/searchbar.html
deleted file mode 100644
index 1b9508e45a..0000000000
--- a/platform/features/search/res/templates/searchbar.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- Open MCT Web, Copyright (c) 2014-2015, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT Web is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT Web includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-
-<!--input class="search-input"
-       id="searchbarinput" 
-       type="text" 
-       value="" /-->
-
-
-<span class='form-control shell'>
-    <span class='field control {{structure.cssclass}}'>
-        <input type="text"
-               ng-model="ngModel">
-    </span>
-</span>
\ No newline at end of file