diff --git a/swig/interfaces/typemaps-general.i b/swig/interfaces/typemaps-general.i
index 3b71e5a2b92f9b864b2b0176aa70e0971c63c6d5..53a061005a659676be3c127a158d8c494e59def1 100644
--- a/swig/interfaces/typemaps-general.i
+++ b/swig/interfaces/typemaps-general.i
@@ -18,7 +18,7 @@
  * Scripting languages are not going to change the default memory manager
  *   so we always default this argument
  */
-%typemap(default) XERCES_CPP_NAMESPACE::MemoryManager* const  manager "$1 = XERCES_CPP_NAMESPACE::XMLPlatformUtils::fgMemoryManager;"
+%typemap(default,numinputs=0) XERCES_CPP_NAMESPACE::MemoryManager* const  manager "$1 = XERCES_CPP_NAMESPACE::XMLPlatformUtils::fgMemoryManager;"
 
 /*
  *  MemBufInputSource::MemBufInputSource()
@@ -49,7 +49,6 @@
     goto fail;
   }
 }
-
 }
 
 /*
@@ -108,61 +107,3 @@ Grammar_dynamic_cast(void **ptr) {
    return NULL;
 }
 %}
-
-
-/*
- * DOM_Node*
- */
-
-%typemap(out) XERCES_CPP_NAMESPACE::DOMNode * = SWIGTYPE *DYNAMIC;
-
-DYNAMIC_CAST(SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMNode, DOMNode_dynamic_cast);
-
-%{
-static swig_type_info *
-DOMNode_dynamic_cast(void **ptr) {
-   DOMNode **nptr = (DOMNode **) ptr;
-   if (*nptr == NULL) {
-       return NULL;
-   }
-   short int type = (*nptr)->getNodeType();
-   if (type == DOMNode::TEXT_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMText;
-   }
-   if (type == DOMNode::PROCESSING_INSTRUCTION_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMProcessingInstruction;
-   }
-   if (type == DOMNode::DOCUMENT_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMDocument;
-   }
-   if (type == DOMNode::ELEMENT_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMElement;
-   }
-   if (type == DOMNode::ENTITY_REFERENCE_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMEntityReference;
-   }
-   if (type == DOMNode::CDATA_SECTION_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMCDATASection;
-   }
-   if (type == DOMNode::CDATA_SECTION_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMCDATASection;
-   }
-   if (type == DOMNode::COMMENT_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMComment;
-   }
-   if (type == DOMNode::DOCUMENT_TYPE_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMDocumentType;
-   }
-   if (type == DOMNode::ENTITY_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMEntity;
-   }
-   if (type == DOMNode::ATTRIBUTE_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMAttr;
-   }
-   if (type == DOMNode::NOTATION_NODE) {
-      return SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMNotation;
-   }
-   return NULL;
-}
-%}
-