diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
index d49e96ae23..1536bfc1d7 100644
--- a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
+++ b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
@@ -727,9 +727,11 @@ public enum ENDPOINT_TIMEOUT_TYPE { ENDPOINT_TIMEOUT, GLOBAL_TIMEOUT, HTTP_CONNE
 
     public static final String DEFAULT_ERROR_TYPE = "ANY";
     public static final String ERROR_STATS_REPORTED = "ERROR_STATS_REPORTED";
+
     public static final String ENABLE_DTD_FORCEFULLY = "payloadFactory.forcefully.enable.DTD";
     public static final String ENABLE_EXTERNAL_ENTITY_FORCEFULLY
         = "payloadFactory.forcefully.enable.external.entity";
+  
     public static final String SYNAPSE_ARTIFACT_DEPENDENCIES = "synapse.artifact.dependencies";
     public static final String SYNAPSE_ARTIFACT_IDENTIFIER = "synapse.artifact.identifier";
     public static final String SYNAPSE_ARTIFACT_VERSIONED_DEPLOYMENT = "synapse.artifact.versioned.deployment";
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java
index 7804f81991..47c03dca16 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java
@@ -26,7 +26,6 @@
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.impl.builder.StAXBuilder;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java
index a1191b9876..449d586146 100644
--- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java
+++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java
@@ -31,7 +31,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.commons.json.JsonUtil;
 import org.apache.synapse.config.xml.SynapsePath;
@@ -553,16 +552,5 @@ public static void readInputFactoryProperties(XMLInputFactory inputFactory) {
         }
         inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
         inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
-        if (Boolean.parseBoolean(System.getProperty(SynapseConstants.ENABLE_DTD_FORCEFULLY))) {
-            inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.TRUE);
-            log.warn("Support for DTDs is enabled forcefully. "
-                + "This may lead to XXE vulnerabilities. Use with caution!");
-        }
-        if (Boolean.parseBoolean(
-            System.getProperty(SynapseConstants.ENABLE_EXTERNAL_ENTITY_FORCEFULLY))) {
-            inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.TRUE);
-            log.warn("Support for External Entities is enabled forcefully."
-                + " This may lead to XXE vulnerabilities. Use with caution!");
-        }
     }
 }