diff --git a/src/com/esri/viewer/components/singleLineSearch/ResultList.as b/src/com/esri/viewer/components/singleLineSearch/ResultList.as
deleted file mode 100644
index 527bacf..0000000
--- a/src/com/esri/viewer/components/singleLineSearch/ResultList.as
+++ /dev/null
@@ -1,26 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010-2011 Esri. All Rights Reserved.
-//
-// 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.
-///////////////////////////////////////////////////////////////////////////
-package com.esri.viewer.components.singleLineSearch
-{
-
-import spark.components.List;
-
-public class ResultList extends List
-{
-    [Bindable]
-    public var searchText:String = "";
-}
-}
diff --git a/src/com/esri/viewer/components/singleLineSearch/ResultListItemRenderer.mxml b/src/com/esri/viewer/components/singleLineSearch/ResultListItemRenderer.mxml
deleted file mode 100644
index 064bdec..0000000
--- a/src/com/esri/viewer/components/singleLineSearch/ResultListItemRenderer.mxml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
-                xmlns:s="library://ns.adobe.com/flex/spark"
-                xmlns:mx="library://ns.adobe.com/flex/mx"
-                autoDrawBackground="true"
-                dataChange="updateSuggestionLabel()">
-    <fx:Script>
-        <![CDATA[
-            import flashx.textLayout.conversion.TextConverter;
-
-            private function updateSuggestionLabel():void
-            {
-                if (!data)
-                {
-                    return;
-                }
-
-                const suggestionMatches:RegExp = new RegExp("(" + (owner as ResultList).searchText + ")", "gi");
-                var suggestionText:String = SearchResultUtil.searchResultToLabel(data);
-                suggestionText = suggestionText.replace(suggestionMatches, "<b>$&</b>");
-                suggestionLabel.textFlow = TextConverter.importToFlow(suggestionText, TextConverter.TEXT_FIELD_HTML_FORMAT);
-            }
-        ]]>
-    </fx:Script>
-
-    <s:RichText id="suggestionLabel"
-                left="3" right="3" top="5" bottom="5"/>
-</s:ItemRenderer>
diff --git a/src/com/esri/viewer/components/singleLineSearch/SearchInputSkin.mxml b/src/com/esri/viewer/components/singleLineSearch/SearchInputSkin.mxml
deleted file mode 100644
index 4cd2406..0000000
--- a/src/com/esri/viewer/components/singleLineSearch/SearchInputSkin.mxml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010-2011 Esri. All Rights Reserved.
-//
-// 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.
-///////////////////////////////////////////////////////////////////////////
--->
-<s:SparkSkin xmlns:fx="http://ns.adobe.com/mxml/2009"
-             xmlns:s="library://ns.adobe.com/flex/spark"
-             xmlns:fb="http://ns.adobe.com/flashbuilder/2009"
-             alpha.disabledStates="0.5"
-             blendMode="normal">
-    <fx:Metadata>
-        <![CDATA[ 
-        [HostComponent("spark.components.TextInput")]
-    ]]>
-    </fx:Metadata>
-
-    <fx:Script fb:purpose="styling">
-        <![CDATA[
-            import mx.core.FlexVersion;
-
-            private var paddingChanged:Boolean;
-
-            /* Define the skin elements that should not be colorized. */
-            static private const exclusions:Array = [ "background", "textDisplay", "promptDisplay", "border" ];
-
-            /* exclusions before Flex 4.5 for backwards-compatibility purposes */
-            static private const exclusions_4_0:Array = [ "background", "textDisplay", "promptDisplay" ];
-
-            /**
-             * @private
-             */
-            override public function get colorizeExclusions():Array
-            {
-                // Since border is styleable via borderColor, no need to allow chromeColor to affect
-                // the border.  This is wrapped in a compatibility flag since this change was added  
-                // in Flex 4.5
-                if (FlexVersion.compatibilityVersion < FlexVersion.VERSION_4_5)
-                {
-                    return exclusions_4_0;
-                }
-
-                return exclusions;
-            }
-
-            /* Define the content fill items that should be colored by the "contentBackgroundColor" style. */
-            static private const contentFill:Array = [ "bgFill" ];
-
-            /**
-             *  @private
-             */
-            override public function get contentItems():Array
-            {
-                return contentFill
-            }
-            ;
-
-            /**
-             *  @private
-             */
-            override protected function commitProperties():void
-            {
-                super.commitProperties();
-
-                if (paddingChanged)
-                {
-                    updatePadding();
-                    paddingChanged = false;
-                }
-            }
-
-            /**
-             * @private
-             */
-            override protected function initializationComplete():void
-            {
-                useChromeColor = true;
-                super.initializationComplete();
-            }
-
-            /**
-             *  @private
-             */
-            override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void
-            {
-                if (getStyle("borderVisible") == true)
-                {
-                    border.visible = true;
-                    shadow.visible = true;
-                    background.left = background.top = background.right = background.bottom = 1;
-                    textDisplay.left = textDisplay.top = textDisplay.right = textDisplay.bottom = 1;
-                    if (promptDisplay)
-                    {
-                        promptDisplay.setLayoutBoundsSize(unscaledWidth - 2, unscaledHeight - 2);
-                        promptDisplay.setLayoutBoundsPosition(1, 1);
-                    }
-                }
-                else
-                {
-                    border.visible = false;
-                    shadow.visible = false;
-                    background.left = background.top = background.right = background.bottom = 0;
-                    textDisplay.left = textDisplay.top = textDisplay.right = textDisplay.bottom = 0;
-                    if (promptDisplay)
-                    {
-                        promptDisplay.setLayoutBoundsSize(unscaledWidth, unscaledHeight);
-                        promptDisplay.setLayoutBoundsPosition(0, 0);
-                    }
-                }
-
-                borderStroke.color = getStyle("borderColor");
-                borderStroke.alpha = getStyle("borderAlpha");
-
-                super.updateDisplayList(unscaledWidth, unscaledHeight);
-            }
-
-            /**
-             *  @private
-             */
-            private function updatePadding():void
-            {
-                if (!textDisplay)
-                {
-                    return;
-                }
-
-                // Push padding styles into the textDisplay
-                var padding:Number;
-
-                padding = getStyle("paddingLeft");
-                if (textDisplay.getStyle("paddingLeft") != padding)
-                {
-                    textDisplay.setStyle("paddingLeft", padding);
-                }
-
-                padding = getStyle("paddingTop");
-                if (textDisplay.getStyle("paddingTop") != padding)
-                {
-                    textDisplay.setStyle("paddingTop", padding);
-                }
-
-                padding = getStyle("paddingRight");
-                if (textDisplay.getStyle("paddingRight") != padding)
-                {
-                    textDisplay.setStyle("paddingRight", padding);
-                }
-
-                padding = getStyle("paddingBottom");
-                if (textDisplay.getStyle("paddingBottom") != padding)
-                {
-                    textDisplay.setStyle("paddingBottom", padding);
-                }
-
-                if (!promptDisplay)
-                {
-                    return;
-                }
-
-                padding = getStyle("paddingLeft");
-                if (promptDisplay.getStyle("paddingLeft") != padding)
-                {
-                    promptDisplay.setStyle("paddingLeft", padding);
-                }
-
-                padding = getStyle("paddingTop");
-                if (promptDisplay.getStyle("paddingTop") != padding)
-                {
-                    promptDisplay.setStyle("paddingTop", padding);
-                }
-
-                padding = getStyle("paddingRight");
-                if (promptDisplay.getStyle("paddingRight") != padding)
-                {
-                    promptDisplay.setStyle("paddingRight", padding);
-                }
-
-                padding = getStyle("paddingBottom");
-                if (promptDisplay.getStyle("paddingBottom") != padding)
-                {
-                    promptDisplay.setStyle("paddingBottom", padding);
-                }
-            }
-
-            /**
-             *  @private
-             */
-            override public function styleChanged(styleProp:String):void
-            {
-                var allStyles:Boolean = !styleProp || styleProp == "styleName";
-
-                super.styleChanged(styleProp);
-
-                if (allStyles || styleProp.indexOf("padding") == 0)
-                {
-                    paddingChanged = true;
-                    invalidateProperties();
-                }
-            }
-        ]]>
-    </fx:Script>
-
-    <fx:Script>
-        <![CDATA[
-            import mx.events.FlexEvent;
-
-            /**
-             * @private
-             */
-            private static const focusExclusions:Array = [ "textDisplay" ];
-
-            /**
-             *  @private
-             */
-            override public function get focusSkinExclusions():Array
-            {
-                return focusExclusions;
-            }
-
-            private function dispatchEnter():void
-            {
-                hostComponent.dispatchEvent(new FlexEvent(FlexEvent.ENTER));
-            }
-        ]]>
-    </fx:Script>
-
-    <s:states>
-        <s:State name="normal"/>
-        <s:State name="disabled" stateGroups="disabledStates"/>
-        <s:State name="normalWithPrompt"/>
-        <s:State name="disabledWithPrompt" stateGroups="disabledStates"/>
-    </s:states>
-
-    <s:Rect id="border"
-            left="0" right="0" top="0" bottom="0">
-        <s:stroke>
-            <s:SolidColorStroke id="borderStroke" weight="1"/>
-        </s:stroke>
-    </s:Rect>
-
-    <s:Rect id="background"
-            left="1" right="1" top="1" bottom="1">
-        <s:fill>
-            <s:SolidColor id="bgFill" color="0xFFFFFF"/>
-        </s:fill>
-    </s:Rect>
-
-    <s:Rect id="shadow"
-            height="1"
-            left="1" right="1" top="1">
-        <s:fill>
-            <s:SolidColor alpha="0.12" color="0x000000"/>
-        </s:fill>
-    </s:Rect>
-
-    <s:HGroup left="2" right="2" top="1" bottom="1"
-              gap="2"
-              verticalAlign="middle">
-        <s:Group width="100%" height="100%">
-            <s:RichEditableText id="textDisplay"
-                                verticalAlign="middle"
-                                widthInChars="10"/>
-
-            <s:Label id="promptDisplay"
-                     includeIn="normalWithPrompt,disabledWithPrompt"
-                     includeInLayout="false"
-                     maxDisplayedLines="1"
-                     mouseChildren="false"
-                     mouseEnabled="false"
-                     verticalAlign="middle"/>
-        </s:Group>
-
-        <s:Image buttonMode="true"
-                 click="dispatchEnter()"
-                 source="assets/images/locate.png"/>
-    </s:HGroup>
-</s:SparkSkin>
diff --git a/src/com/esri/viewer/components/singleLineSearch/SearchLayer.as b/src/com/esri/viewer/components/singleLineSearch/SearchLayer.as
deleted file mode 100644
index 56e8559..0000000
--- a/src/com/esri/viewer/components/singleLineSearch/SearchLayer.as
+++ /dev/null
@@ -1,25 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010-2011 Esri. All Rights Reserved.
-//
-// 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.
-///////////////////////////////////////////////////////////////////////////
-package com.esri.viewer.components.singleLineSearch
-{
-
-public class SearchLayer
-{
-    public var layerIds:Array;
-    public var layerURL:String;
-    public var searchFields:Array;
-}
-}
diff --git a/src/com/esri/viewer/components/singleLineSearch/SearchResultUtil.as b/src/com/esri/viewer/components/singleLineSearch/SearchResultUtil.as
deleted file mode 100644
index fe80fdd..0000000
--- a/src/com/esri/viewer/components/singleLineSearch/SearchResultUtil.as
+++ /dev/null
@@ -1,55 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010-2011 Esri. All Rights Reserved.
-//
-// 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.
-///////////////////////////////////////////////////////////////////////////
-package com.esri.viewer.components.singleLineSearch
-{
-
-import com.esri.ags.tasks.supportClasses.AddressCandidate;
-import com.esri.ags.tasks.supportClasses.FindResult;
-
-import mx.utils.StringUtil;
-
-public class SearchResultUtil
-{
-    public static function searchResultToLabel(searchResult:Object):String
-    {
-        if (searchResult is FindResult)
-        {
-            return findResultToLabel(searchResult as FindResult);
-        }
-        else if (searchResult is AddressCandidate)
-        {
-            return (searchResult as AddressCandidate).address as String;
-        }
-        else if (searchResult == null)
-        {
-            return "";
-        }
-        else
-        {
-            return searchResult as String;
-        }
-    }
-
-    private static function findResultToLabel(findResult:FindResult):String
-    {
-        return StringUtil.substitute('{0} - {1} - {2} ({3})',
-                                     findResult.value,
-                                     findResult.foundFieldName,
-                                     findResult.layerName,
-                                     findResult.layerId);
-    }
-}
-}