diff --git a/lldb/include/lldb/Symbol/SymbolContext.h b/lldb/include/lldb/Symbol/SymbolContext.h
index a0b186269780b745520c377844de2f13b402a7eb..055a4f04a1441712aaa9fcd1b368a764dc59c5c1 100644
--- a/lldb/include/lldb/Symbol/SymbolContext.h
+++ b/lldb/include/lldb/Symbol/SymbolContext.h
@@ -220,54 +220,6 @@ public:
     uint32_t
     GetResolvedMask () const;
 
-
-    //------------------------------------------------------------------
-    /// Find a function matching the given name, working out from this
-    /// symbol context.
-    ///
-    /// @return
-    ///     The number of symbol contexts found.
-    //------------------------------------------------------------------
-    size_t
-    FindFunctionsByName (const ConstString &name,
-                         uint32_t name_type_mask,
-                         bool include_symbols,
-                         bool append, 
-                         SymbolContextList &sc_list) const;
-
-
-    ClangNamespaceDecl
-    FindNamespace (const ConstString &name) const;
-
-    //------------------------------------------------------------------
-    /// Find a variable matching the given name, working out from this
-    /// symbol context.
-    ///
-    /// @return
-    ///     A shared pointer to the variable found.
-    //------------------------------------------------------------------
-    //lldb::VariableSP
-    //FindVariableByName (const char *name) const;
-
-    //------------------------------------------------------------------
-    /// Find a type matching the given name, working out from this
-    /// symbol context.
-    ///
-    /// @return
-    ///     A shared pointer to the variable found.
-    //------------------------------------------------------------------
-    lldb::TypeSP
-    FindTypeByName (const ConstString &name) const;
-    
-//    static SymbolContext
-//    CreateSymbolContextFromDescription (lldb::TargetSP &target,
-//                                        const char *module,
-//                                        const char *comp_unit,
-//                                        const char *function,
-//                                        const char *block_spec
-//                                        const char *line_number,
-//                                        const char *symbol);
-
     //------------------------------------------------------------------
     /// Find a name of the innermost function for the symbol context.
     ///
diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 6db37572f8f003e7bd07725b8bb9f395eb3937a8..570570c610f018941a50288efcdfa7bf642e2c89 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -1970,23 +1970,6 @@ ClangExpressionDeclMap::FindGlobalDataSymbol
     return NULL;
 }
 
-// This is a callback used with Variable::GetValuesForVariableExpressionPath
-
-static uint32_t GetVariableCallback (void *baton, 
-                                     const char *name,
-                                     VariableList &variable_list)
-{
-    Target *target = static_cast<Target *>(baton);
-    if (target)
-    {
-        return target->GetImages().FindGlobalVariables (ConstString(name),
-                                                        true, 
-                                                        UINT32_MAX, 
-                                                        variable_list);
-    }
-    return 0;
-}
-
 lldb::VariableSP
 ClangExpressionDeclMap::FindGlobalVariable
 (
diff --git a/lldb/source/Symbol/SymbolContext.cpp b/lldb/source/Symbol/SymbolContext.cpp
index f571d44d415f7e2aa453c7699afb455da3074fcb..673dc3cb545a424d152ae30c082ab6c76f2e312d 100644
--- a/lldb/source/Symbol/SymbolContext.cpp
+++ b/lldb/source/Symbol/SymbolContext.cpp
@@ -452,83 +452,6 @@ SymbolContext::GetAddressRange (uint32_t scope,
     return false;
 }
 
-ClangNamespaceDecl
-SymbolContext::FindNamespace (const ConstString &name) const
-{
-    ClangNamespaceDecl namespace_decl;
-    if (module_sp)
-        namespace_decl = module_sp->GetSymbolVendor()->FindNamespace (*this, name, NULL);
-    return namespace_decl;
-}
-
-size_t
-SymbolContext::FindFunctionsByName (const ConstString &name, 
-                                    uint32_t name_type_mask,
-                                    bool include_symbols, 
-                                    bool append, 
-                                    SymbolContextList &sc_list) const
-{    
-    if (!append)
-        sc_list.Clear();
-    uint32_t old_size = sc_list.GetSize();
-    
-    if (function != NULL)
-    {
-        // FIXME: Look in the class of the current function, if it exists,
-        // for methods matching name.
-    }
-
-    if (module_sp)
-        module_sp->FindFunctions (name, NULL, name_type_mask, include_symbols, true, sc_list);
-
-    if (target_sp)
-    {
-        if (!module_sp)
-        {
-            target_sp->GetImages().FindFunctions (name, name_type_mask, include_symbols, true, sc_list);
-        }
-        else
-        {
-            ModuleList &modules = target_sp->GetImages();
-            uint32_t num_modules = modules.GetSize();
-            for (uint32_t i = 0; i < num_modules; i++)
-            {
-                ModuleSP iter_module_sp = modules.GetModuleAtIndex(i);
-                if (module_sp != iter_module_sp)
-                    iter_module_sp->FindFunctions (name, NULL, name_type_mask, include_symbols, true, sc_list);
-            }
-        }
-    }
-    return sc_list.GetSize() - old_size;
-}
-
-//lldb::VariableSP
-//SymbolContext::FindVariableByName (const char *name) const
-//{
-//    lldb::VariableSP return_value;
-//    return return_value;
-//}
-
-lldb::TypeSP
-SymbolContext::FindTypeByName (const ConstString &name) const
-{
-    lldb::TypeSP return_value;
-        
-    TypeList types;
-    
-    if (module_sp && module_sp->FindTypes (*this, name, NULL, false, 1, types))
-        return types.GetTypeAtIndex(0);
-    
-    SymbolContext sc_for_global_search;
-    
-    sc_for_global_search.target_sp = target_sp;
-    
-    if (!return_value.get() && target_sp && target_sp->GetImages().FindTypes (sc_for_global_search, name, false, 1, types))
-        return types.GetTypeAtIndex(0);
-    
-    return return_value;
-}
-
 bool
 SymbolContext::GetParentOfInlinedScope (const Address &curr_frame_pc, 
                                         SymbolContext &next_frame_sc,