3 files changed, 1 insertions, 17 deletions
diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb
index f181773687..bf68701229 100644
--- a/lib/soap/mapping/factory.rb
+++ b/lib/soap/mapping/factory.rb
@@ -87,14 +87,6 @@ class Factory
     Thread.current[:SOAPMarshalDataKey][node.id] = obj
   end
 
-  def name2typename(name)
-    capitalize(name)
-  end
-
-  def capitalize(target)
-    target.gsub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') }
-  end
-
 private
 
   def setiv2ary(obj, node, map)
diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb
index 4b68b811fc..38a01bac07 100644
--- a/lib/soap/mapping/mapping.rb
+++ b/lib/soap/mapping/mapping.rb
@@ -98,9 +98,7 @@ module Mapping
 
   def self._obj2soap(obj, registry, type = nil)
     if referent = Thread.current[:SOAPMarshalDataKey][obj.__id__]
-      soap_obj = SOAPReference.new
-      soap_obj.__setobj__(referent)
-      soap_obj
+      SOAPReference.new(referent)
     else
       registry.obj2soap(obj.class, obj, type)
     end
diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb
index 0b4af8b8e4..a447715add 100644
--- a/lib/soap/mapping/rubytypeFactory.rb
+++ b/lib/soap/mapping/rubytypeFactory.rb
@@ -344,9 +344,6 @@ private
       typestr = Mapping.elename2name(node['type'].data)
       klass = Mapping.class_from_name(typestr)
       if klass.nil?
-        klass = Mapping.class_from_name(name2typename(typestr))
-      end
-      if klass.nil?
         return false
       end
       unless klass <= ::Struct
@@ -401,9 +398,6 @@ private
     typestr = Mapping.elename2name(node.type.name)
     klass = Mapping.class_from_name(typestr)
     if klass.nil?
-      klass = Mapping.class_from_name(name2typename(typestr))
-    end
-    if klass.nil?
       return nil
     end
     if klass <= ::Exception