diff --git a/src/xercesc/internal/IGXMLScanner.cpp b/src/xercesc/internal/IGXMLScanner.cpp
index a20d20f9c33e29782b23b7e9e0792b47eacfcbf0..ef2b839eb0f90c937ae1f82a634f3d563ab64935 100644
--- a/src/xercesc/internal/IGXMLScanner.cpp
+++ b/src/xercesc/internal/IGXMLScanner.cpp
@@ -2274,8 +2274,6 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
     //  generic element decl object. We tell him to fault one in if he does
     //  not find it.
     bool wasAdded = false;
-    bool errorBeforeElementFound = false;
-    bool laxBeforeElementFound = false;
 
     const XMLCh* nameRawBuf = &qnameRawBuf[prefixColonPos + 1];
     const XMLCh* original_uriStr = fGrammar->getTargetNamespace();
@@ -2320,10 +2318,7 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
                     XMLValid::GrammarNotFound
                     ,uriStr
                 );
-                errorBeforeElementFound = true;
             }
-            else if(errorCondition)
-                laxBeforeElementFound = true;
 
             elemDecl = fGrammar->getElemDecl
             (
@@ -2368,10 +2363,7 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
                         XMLValid::ElementNotUnQualified
                         , elemDecl->getFullName()
                     );
-                    errorBeforeElementFound = true;
                 }
-                else if(errorCondition)
-                    laxBeforeElementFound = true;
             }
         }
 
@@ -2451,10 +2443,7 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
                     XMLValid::GrammarNotFound
                   , XMLUni::fgZeroLenString
                 );
-                errorBeforeElementFound = true;
             }
-            else if(errorCondition)
-                laxBeforeElementFound = true;
 
             elemDecl = fGrammar->getElemDecl
             (
@@ -2492,10 +2481,7 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
                         XMLValid::GrammarNotFound
                         ,original_uriStr
                     );
-                    errorBeforeElementFound = true;
                 }
-                else if(errorCondition)
-                    laxBeforeElementFound = true;
 
                 elemDecl = fGrammar->getElemDecl
                            (
@@ -2510,7 +2496,6 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
                         XMLValid::ElementNotQualified
                         , elemDecl->getFullName()
                     );
-                    errorBeforeElementFound = true;
                 }
             }
         }
diff --git a/src/xercesc/internal/SGXMLScanner.cpp b/src/xercesc/internal/SGXMLScanner.cpp
index ee164f47b331892847af0ae2917bb680846c10ca..d504746cf4a24c2df802193b015fc67f0adab340 100644
--- a/src/xercesc/internal/SGXMLScanner.cpp
+++ b/src/xercesc/internal/SGXMLScanner.cpp
@@ -1198,8 +1198,6 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
     //  not find it.
     XMLElementDecl* elemDecl = 0;
     bool wasAdded = false;
-    bool errorBeforeElementFound = false;
-    bool laxBeforeElementFound = false;
     const XMLCh* nameRawBuf = &qnameRawBuf[prefixColonPos + 1];
     const XMLCh* original_uriStr = fGrammar->getTargetNamespace();
 
@@ -1235,10 +1233,7 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
                     XMLValid::GrammarNotFound
                     ,uriStr
                 );
-                errorBeforeElementFound = true;
             } 
-            else if(errorCondition)
-                laxBeforeElementFound = true;
 
             elemDecl = fGrammar->getElemDecl
             (
@@ -1281,11 +1276,7 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
                         XMLValid::ElementNotUnQualified
                         , elemDecl->getFullName()
                     );
-                    errorBeforeElementFound = true;
                 }
-                else if(errorCondition) 
-                    laxBeforeElementFound = true;
-
             }
         }
 
@@ -1343,12 +1334,8 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
                 (
                     XMLValid::GrammarNotFound
                   , XMLUni::fgZeroLenString
-                );
-                errorBeforeElementFound = true;
-                
+                );                
             }
-            else if(errorCondition)
-                laxBeforeElementFound = true; 
 
             elemDecl = fGrammar->getElemDecl
             (
@@ -1385,10 +1372,7 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
                         XMLValid::GrammarNotFound
                         ,original_uriStr
                     );
-                    errorBeforeElementFound = true;
                 }
-                else if(errorCondition)
-                    laxBeforeElementFound = true; 
 
                 elemDecl = fGrammar->getElemDecl
                            (
@@ -1403,7 +1387,6 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
                         XMLValid::ElementNotQualified
                         , elemDecl->getFullName()
                     );
-                    errorBeforeElementFound = true;
                 }
             }
         }
diff --git a/src/xercesc/parsers/AbstractDOMParser.cpp b/src/xercesc/parsers/AbstractDOMParser.cpp
index 5ef95e2de7e3f66768256b15ccaa88dc57eae526..6140965a0c22e0b039c333459c089188d56993e2 100644
--- a/src/xercesc/parsers/AbstractDOMParser.cpp
+++ b/src/xercesc/parsers/AbstractDOMParser.cpp
@@ -759,12 +759,9 @@ void AbstractDOMParser::endEntityReference(const XMLEntityDecl&)
     if (!fCreateEntityReferenceNodes) return;
 
     DOMEntityReferenceImpl *erImpl = 0;
-    DOMNode* firstChild = 0;
 
-    if (fCurrentParent->getNodeType() == DOMNode::ENTITY_REFERENCE_NODE) {
+    if (fCurrentParent->getNodeType() == DOMNode::ENTITY_REFERENCE_NODE)
         erImpl = (DOMEntityReferenceImpl *) fCurrentParent;
-        firstChild = erImpl->getFirstChild();
-    }
 
     fCurrentParent = fNodeStack->pop();