diff --git a/core/src/main/java/coldfusion/runtime/SessionTracker.java b/core/src/main/java/coldfusion/runtime/SessionTracker.java
index 1f13bfd285..9d251fe1fd 100755
--- a/core/src/main/java/coldfusion/runtime/SessionTracker.java
+++ b/core/src/main/java/coldfusion/runtime/SessionTracker.java
@@ -37,22 +37,4 @@ public static Struct getSessionCollection(String appName) {
 		ScopeContext sc = ((CFMLFactoryImpl) pc.getCFMLFactory()).getScopeContext();
 		return sc.getAllSessionScopes(appName);
 	}
-
-	/*
-	 * public static coldfusion.runtime.SessionScope getSession(java.lang.String,java.lang.String)
-	 * public static coldfusion.runtime.SessionScope getSession(java.lang.String) public static
-	 * coldfusion.runtime.SessionScope getSession(javax.servlet.http.HttpSession,java.lang.String)
-	 * public static coldfusion.runtime.SessionScope
-	 * getSession(java.lang.String,java.lang.String,java.lang.String) public static
-	 * coldfusion.runtime.SessionScope createSession(java.lang.String,java.lang.String) public static
-	 * coldfusion.runtime.SessionScope createSession(java.lang.String,java.lang.String,java.lang.String)
-	 * public static coldfusion.runtime.SessionScope
-	 * createSession(javax.servlet.http.HttpSession,java.lang.String) public static void
-	 * cleanUp(java.lang.String,java.lang.String,java.lang.String) public static void
-	 * cleanUp(javax.servlet.http.HttpSession,java.lang.String) public static void
-	 * cleanUp(java.lang.String,java.lang.String) public static java.util.Enumeration getSessionKeys()
-	 * public static java.util.Hashtable getMSessionPool() public static
-	 * coldfusion.runtime.AppSessionCollection getSessionCollection(java.lang.String)
-	 */
-
 }
\ No newline at end of file
diff --git a/core/src/main/java/lucee/commons/lang/compiler/JVMCompiler.java b/core/src/main/java/lucee/commons/lang/compiler/JVMCompiler.java
index ed58f296e2..797bb1df1a 100644
--- a/core/src/main/java/lucee/commons/lang/compiler/JVMCompiler.java
+++ b/core/src/main/java/lucee/commons/lang/compiler/JVMCompiler.java
@@ -7,6 +7,7 @@
 
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.ToolProvider;
 
@@ -25,7 +26,7 @@ public byte[] compile(ConfigPro config, SourceCode sc) throws ApplicationExcepti
 		Collection<SourceCode> compilationUnits = new ArrayList<>();
 		compilationUnits.add(sc);
 		DynamicClassLoader dcl = new DynamicClassLoader(cl);
-		javax.tools.JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
+		JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
 		if (javac == null) {
 			throw new ApplicationException("Java compiling is not suppprted with your current JVM Environment (" + System.getProperty("java.vendor") + " "
 					+ System.getProperty("java.version")
@@ -40,7 +41,7 @@ public byte[] compile(ConfigPro config, SourceCode sc) throws ApplicationExcepti
 		DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
 
 		ExtendedStandardJavaFileManager fileManager = new ExtendedStandardJavaFileManager(javac.getStandardFileManager(null, null, null), dcl);
-		javax.tools.JavaCompiler.CompilationTask task = javac.getTask(null, fileManager, collector, options, null, compilationUnits);
+		JavaCompiler.CompilationTask task = javac.getTask(null, fileManager, collector, options, null, compilationUnits);
 		boolean result = task.call();
 
 		if (!result || collector.getDiagnostics().size() > 0) {
diff --git a/core/src/main/java/lucee/commons/management/MemoryNotificationListener.java b/core/src/main/java/lucee/commons/management/MemoryNotificationListener.java
index c0e30c81c0..40279c2907 100644
--- a/core/src/main/java/lucee/commons/management/MemoryNotificationListener.java
+++ b/core/src/main/java/lucee/commons/management/MemoryNotificationListener.java
@@ -55,61 +55,6 @@ else if (type == MemoryType.NON_HEAP) {
 				((Config) handback).checkPermGenSpace(false);
 			}
 
-			/*
-			 * CompositeDataSupport usage=(CompositeDataSupport) data.get("usage"); print.e(poolName);
-			 * print.e(types.get(poolName)); print.e(data.get("count"));
-			 * 
-			 * print.e(usage.get("committed")); print.e(usage.get("init")); print.e(usage.get("max"));
-			 * print.e(usage.get("used"));
-			 * 
-			 * long max=Caster.toLongValue(usage.get("max"),0); long
-			 * used=Caster.toLongValue(usage.get("used"),0); long free=max-used; print.o("m:"+max);
-			 * print.o("f:"+free); print.o("%:"+(100L*used/max)); //not.
-			 */
 		}
-		/*
-		 * javax.management.openmbean.CompositeDataSupport(
-		 * compositeType=javax.management.openmbean.CompositeType( name=java.lang.management.MemoryUsage,
-		 * items=( (itemName=committed,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=init,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=max,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=used,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)))),contents={
-		 * committed=101580800, init=65404928, max=110362624, used=101085960})
-		 * 
-		 * 
-		 * 
-		 * javax.management.openmbean.CompositeDataSupport(
-		 * compositeType=javax.management.openmbean.CompositeType(
-		 * name=java.lang.management.MemoryNotificationInfo, items=(
-		 * (itemName=count,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),
-		 * (itemName=poolName,itemType=javax.management.openmbean.SimpleType(name=java.lang.String)),
-		 * (itemName=usage,itemType=javax.management.openmbean.CompositeType(name=java.lang.management.
-		 * MemoryUsage,items=((itemName=committed,itemType=javax.management.openmbean.SimpleType(name=java.
-		 * lang.Long)),(itemName=init,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),(
-		 * itemName=max,itemType=javax.management.openmbean.SimpleType(name=java.lang.Long)),(itemName=used,
-		 * itemType=javax.management.openmbean.SimpleType(name=java.lang.Long))))))),contents={count=1,
-		 * poolName=CMS Old Gen,
-		 * usage=javax.management.openmbean.CompositeDataSupport(compositeType=javax.management.openmbean.
-		 * CompositeType(name=java.lang.management.MemoryUsage,items=((itemName=committed,itemType=javax.
-		 * management.openmbean.SimpleType(name=java.lang.Long)),(itemName=init,itemType=javax.management.
-		 * openmbean.SimpleType(name=java.lang.Long)),(itemName=max,itemType=javax.management.openmbean.
-		 * SimpleType(name=java.lang.Long)),(itemName=used,itemType=javax.management.openmbean.SimpleType(
-		 * name=java.lang.Long)))),contents={committed=101580800, init=65404928, max=110362624,
-		 * used=101085944})})
-		 * 
-		 */
-		/*
-		 * print.e(data.getCompositeType()); print.e(not.getSource().getClass().getName());
-		 * print.e(not.getSource()); ObjectName on=(ObjectName) not.getSource();
-		 * print.e(on.getKeyPropertyList());
-		 */
-
-		/*
-		 * print.e(not.getUserData().getClass().getName()); print.e(not.getUserData());
-		 * 
-		 * print.e(not.getMessage()); print.e(not.getSequenceNumber()); print.e(not.getTimeStamp());
-		 * print.e(not.getType());
-		 */
 	}
-
 }
\ No newline at end of file
diff --git a/core/src/main/java/lucee/runtime/CFMLFactoryImpl.java b/core/src/main/java/lucee/runtime/CFMLFactoryImpl.java
index c0b08464a3..c1a43c3c76 100644
--- a/core/src/main/java/lucee/runtime/CFMLFactoryImpl.java
+++ b/core/src/main/java/lucee/runtime/CFMLFactoryImpl.java
@@ -149,7 +149,7 @@ public void resetPageContext() {
 
 	@Override
 	public javax.servlet.jsp.PageContext getPageContext(Servlet servlet, ServletRequest req, ServletResponse rsp, String errorPageURL, boolean needsSession, int bufferSize,
-			boolean autoflush) {
+			boolean autoflush) {/* JAVJAK */
 		return getPageContextImpl((HttpServlet) servlet, (HttpServletRequest) req, (HttpServletResponse) rsp, errorPageURL, needsSession, bufferSize, autoflush, true, false, -1,
 				true, false, false, null);
 	}
@@ -249,7 +249,7 @@ public PageContextImpl getPageContextImpl(HttpServlet servlet, HttpServletReques
 	}
 
 	@Override
-	public void releasePageContext(javax.servlet.jsp.PageContext pc) {
+	public void releasePageContext(javax.servlet.jsp.PageContext pc) {/* JAVJAK */
 		releaseLuceePageContext((PageContext) pc, true);
 	}
 
diff --git a/core/src/main/java/lucee/runtime/PageContextImpl.java b/core/src/main/java/lucee/runtime/PageContextImpl.java
index 31acb39e77..086975504d 100644
--- a/core/src/main/java/lucee/runtime/PageContextImpl.java
+++ b/core/src/main/java/lucee/runtime/PageContextImpl.java
@@ -2052,18 +2052,18 @@ public void setAttribute(String name, Object value) {
 	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		switch (scope) {
-		case javax.servlet.jsp.PageContext.APPLICATION_SCOPE:
+		case PageContext.APPLICATION_SCOPE:
 			if (value == null) getServletContext().removeAttribute(name);
 			else getServletContext().setAttribute(name, value);
 			break;
-		case javax.servlet.jsp.PageContext.PAGE_SCOPE:
+		case PageContext.PAGE_SCOPE:
 			setAttribute(name, value);
 			break;
-		case javax.servlet.jsp.PageContext.REQUEST_SCOPE:
+		case PageContext.REQUEST_SCOPE:
 			if (value == null) req.removeAttribute(name);
 			else setAttribute(name, value);
 			break;
-		case javax.servlet.jsp.PageContext.SESSION_SCOPE:
+		case PageContext.SESSION_SCOPE:
 			HttpSession s = req.getSession(true);
 			if (value == null) s.removeAttribute(name);
 			else s.setAttribute(name, value);
@@ -2084,13 +2084,13 @@ public Object getAttribute(String name) {
 	@Override
 	public Object getAttribute(String name, int scope) {
 		switch (scope) {
-		case javax.servlet.jsp.PageContext.APPLICATION_SCOPE:
+		case PageContext.APPLICATION_SCOPE:
 			return getServletContext().getAttribute(name);
-		case javax.servlet.jsp.PageContext.PAGE_SCOPE:
+		case PageContext.PAGE_SCOPE:
 			return getAttribute(name);
-		case javax.servlet.jsp.PageContext.REQUEST_SCOPE:
+		case PageContext.REQUEST_SCOPE:
 			return req.getAttribute(name);
-		case javax.servlet.jsp.PageContext.SESSION_SCOPE:
+		case PageContext.SESSION_SCOPE:
 			HttpSession s = req.getSession();
 			if (s != null) return s.getAttribute(name);
 			break;
@@ -2146,13 +2146,13 @@ public int getAttributesScope(String name) {
 	public Enumeration<String> getAttributeNamesInScope(int scope) {
 
 		switch (scope) {
-		case javax.servlet.jsp.PageContext.APPLICATION_SCOPE:
+		case PageContext.APPLICATION_SCOPE:
 			return getServletContext().getAttributeNames();
-		case javax.servlet.jsp.PageContext.PAGE_SCOPE:
+		case PageContext.PAGE_SCOPE:
 			return ItAsEnum.toStringEnumeration(variablesScope().keyIterator());
-		case javax.servlet.jsp.PageContext.REQUEST_SCOPE:
+		case PageContext.REQUEST_SCOPE:
 			return req.getAttributeNames();
-		case javax.servlet.jsp.PageContext.SESSION_SCOPE:
+		case PageContext.SESSION_SCOPE:
 			return req.getSession(true).getAttributeNames();
 		}
 		return null;
@@ -2900,7 +2900,7 @@ private void initIdAndToken() {
 				Charset charset = getWebCharset();
 
 				// check if we have multiple cookies with the name "cfid" and another one is valid
-				javax.servlet.http.Cookie[] cookies = getHttpServletRequest().getCookies();
+				javax.servlet.http.Cookie[] cookies = getHttpServletRequest().getCookies();/* JAVJAK */
 				String name, value;
 				if (cookies != null) {
 					for (int i = 0; i < cookies.length; i++) {
diff --git a/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java b/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java
index 55085a32e1..82f56240e2 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java
@@ -293,7 +293,8 @@ private static void createContextFiles(Resource configDir, ConfigServer config,
 		Resource secDir = configDir.getRealResource("security");
 		if (!secDir.exists()) secDir.mkdirs();
 		Resource res = create("/resource/security/", "cacerts", secDir, false);
-		if (SystemUtil.getSystemPropOrEnvVar("lucee.use.lucee.SSL.TrustStore", "").equalsIgnoreCase("true")) System.setProperty("javax.net.ssl.trustStore", res.toString());
+		if (SystemUtil.getSystemPropOrEnvVar("lucee.use.lucee.SSL.TrustStore", "").equalsIgnoreCase("true"))
+			System.setProperty("javax.net.ssl.trustStore", res.toString());/* JAVJAK */
 		// Allow using system proxies
 		if (!SystemUtil.getSystemPropOrEnvVar("lucee.disable.systemProxies", "").equalsIgnoreCase("true")) System.setProperty("java.net.useSystemProxies", "true"); // it defaults
 																																									// to false
diff --git a/core/src/main/java/lucee/runtime/config/ConfigServerImpl.java b/core/src/main/java/lucee/runtime/config/ConfigServerImpl.java
index b93f6f6cd7..950f0d702c 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigServerImpl.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigServerImpl.java
@@ -478,8 +478,7 @@ public void reset() {
 	@Override
 	public Resource getSecurityDirectory() {
 		Resource cacerts = null;
-		// javax.net.ssl.trustStore
-		String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");
+		String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");/* JAVJAK */
 		if (trustStore != null) {
 			cacerts = ResourcesImpl.getFileResourceProvider().getResource(trustStore);
 		}
diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java b/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java
index fddf2f54ef..4b0876eb42 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java
@@ -3,6 +3,9 @@
 import java.io.IOException;
 
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.osgi.framework.BundleException;
 import org.xml.sax.SAXException;
@@ -297,7 +300,7 @@ public java.lang.ClassLoader getClassLoaderCore() {
 	}
 
 	@Override
-	public javax.servlet.ServletContext getServletContext() {
+	public ServletContext getServletContext() {
 		return instance.getServletContext();
 	}
 
@@ -1637,7 +1640,7 @@ public boolean getExecutionLogEnabled() {
 	}
 
 	@Override
-	public CFMLWriter getWriter(lucee.runtime.PageContext arg0, javax.servlet.http.HttpServletRequest arg1, javax.servlet.http.HttpServletResponse arg2) {
+	public CFMLWriter getWriter(lucee.runtime.PageContext arg0, HttpServletRequest arg1, HttpServletResponse arg2) {
 		return instance.getCFMLWriter(arg0, arg1, arg2);
 	}
 
@@ -1662,7 +1665,7 @@ public lucee.runtime.security.SecurityManager getSecurityManager() {
 	}
 
 	@Override
-	public lucee.runtime.writer.CFMLWriter getCFMLWriter(lucee.runtime.PageContext arg0, javax.servlet.http.HttpServletRequest arg1, javax.servlet.http.HttpServletResponse arg2) {
+	public lucee.runtime.writer.CFMLWriter getCFMLWriter(lucee.runtime.PageContext arg0, HttpServletRequest arg1, HttpServletResponse arg2) {
 		return instance.getCFMLWriter(arg0, arg1, arg2);
 	}
 
diff --git a/core/src/main/java/lucee/runtime/net/http/HTTPServletRequestWrap.java b/core/src/main/java/lucee/runtime/net/http/HTTPServletRequestWrap.java
index 38c871a871..7c3fb144cf 100755
--- a/core/src/main/java/lucee/runtime/net/http/HTTPServletRequestWrap.java
+++ b/core/src/main/java/lucee/runtime/net/http/HTTPServletRequestWrap.java
@@ -137,7 +137,7 @@ private static class DisconnectData {
 	 * @param max how many is possible to re read
 	 */
 	public HTTPServletRequestWrap(HttpServletRequest req) {
-		this.req = pure(req);
+		this.req = pure(req);/* JAVJAK */
 		if ((servlet_path = attrAsString("javax.servlet.include.servlet_path")) != null) {
 			request_uri = attrAsString("javax.servlet.include.request_uri");
 			context_path = attrAsString("javax.servlet.include.context_path");
diff --git a/core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java b/core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java
index f6ba110076..4f41b46ca8 100644
--- a/core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java
+++ b/core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java
@@ -192,7 +192,6 @@ public static void setCharacterEncoding(HttpServletResponse rsp, String charset)
 	}
 
 	public static String getQueryString(HttpServletRequest req) {
-		// String qs = req.getAttribute("javax.servlet.include.query_string");
 		return req.getQueryString();
 	}
 
@@ -622,7 +621,7 @@ private static Charset _getCharacterEncoding(PageContext pc, String ce) {
 	}
 
 	public static void removeCookie(HttpServletResponse rsp, String name) {
-		javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name, "");
+		Cookie cookie = new Cookie(name, "");
 		cookie.setMaxAge(0);
 		cookie.setSecure(false);
 		cookie.setPath("/");
diff --git a/core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java b/core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java
index 0f4a4a9888..7a5e0354f6 100644
--- a/core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java
+++ b/core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java
@@ -240,17 +240,17 @@ public void addListener(Class<? extends EventListener> arg0) {
 	}
 
 	@Override
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
+	public ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
 		throw new RuntimeException("not supported");
 	}
 
 	@Override
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
+	public ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
 		throw new RuntimeException("not supported");
 	}
 
 	@Override
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Class<? extends Servlet> arg1) {
+	public ServletRegistration.Dynamic addServlet(String arg0, Class<? extends Servlet> arg1) {
 		throw new RuntimeException("not supported");
 	}
 
diff --git a/core/src/main/java/lucee/runtime/net/ldap/LDAPClient.java b/core/src/main/java/lucee/runtime/net/ldap/LDAPClient.java
index cafbf8de77..50f5b566a9 100644
--- a/core/src/main/java/lucee/runtime/net/ldap/LDAPClient.java
+++ b/core/src/main/java/lucee/runtime/net/ldap/LDAPClient.java
@@ -137,7 +137,7 @@ public void setSecureLevel(short secureLevel) throws ClassException {
 		// Security
 		if (secureLevel == SECURE_CFSSL_BASIC) {
 			env.put("java.naming.security.protocol", "ssl");
-			env.put("java.naming.ldap.factory.socket", "javax.net.ssl.SSLSocketFactory");
+			env.put("java.naming.ldap.factory.socket", "javax.net.ssl.SSLSocketFactory");/* JAVJAK */
 			Class clazz = ClassUtil.loadClass("com.sun.net.ssl.internal.ssl.Provider");
 
 			try {
diff --git a/core/src/main/java/lucee/runtime/net/mail/HtmlEmailImpl.java b/core/src/main/java/lucee/runtime/net/mail/HtmlEmailImpl.java
index d58b2989fa..31a3365f51 100644
--- a/core/src/main/java/lucee/runtime/net/mail/HtmlEmailImpl.java
+++ b/core/src/main/java/lucee/runtime/net/mail/HtmlEmailImpl.java
@@ -80,7 +80,6 @@ public final class HtmlEmailImpl extends MultiPartEmail {
 	 *
 	 * @param aText A String.
 	 * @return An HtmlEmail.
-	 * @throws EmailException see javax.mail.internet.MimeBodyPart for definitions
 	 *
 	 */
 	public HtmlEmailImpl setTextMsg(String aText) throws EmailException {
@@ -96,7 +95,6 @@ public HtmlEmailImpl setTextMsg(String aText) throws EmailException {
 	 *
 	 * @param aHtml A String.
 	 * @return An HtmlEmail.
-	 * @throws EmailException see javax.mail.internet.MimeBodyPart for definitions
 	 *
 	 */
 	public HtmlEmailImpl setHtmlMsg(String aHtml) throws EmailException {
@@ -117,7 +115,6 @@ public HtmlEmailImpl setHtmlMsg(String aHtml) throws EmailException {
 	 *
 	 * @param msg A String.
 	 * @return An Email.
-	 * @throws EmailException see javax.mail.internet.MimeBodyPart for definitions
 	 *
 	 */
 	@Override
@@ -154,8 +151,7 @@ public Email setMsg(String msg) throws EmailException {
 	 * @param url The URL of the file.
 	 * @param cid A String with the Content-ID of the file.
 	 * @param name The name that will be set in the filename header field.
-	 * @throws EmailException when URL supplied is invalid also see javax.mail.internet.MimeBodyPart for
-	 *             definitions
+	 * @throws EmailException when URL supplied is invalid
 	 *
 	 */
 	public void embed(URL url, String cid, String name) throws EmailException {
diff --git a/core/src/main/java/lucee/runtime/net/mail/MailClient.java b/core/src/main/java/lucee/runtime/net/mail/MailClient.java
index 9b7779fcd2..2f69bde116 100644
--- a/core/src/main/java/lucee/runtime/net/mail/MailClient.java
+++ b/core/src/main/java/lucee/runtime/net/mail/MailClient.java
@@ -318,7 +318,7 @@ public void deleteMails(String messageNumber, String uid) throws MessagingExcept
 			amessage[i++] = map.get(iterator.next());
 		}
 		try {
-			folder.setFlags(amessage, new Flags(javax.mail.Flags.Flag.DELETED), true);
+			folder.setFlags(amessage, new Flags(Flags.Flag.DELETED), true);
 		}
 		finally {
 			folder.close(true);
@@ -857,7 +857,7 @@ public void moveMail(String srcFolderName, String trgFolderName, String messageN
 				amessage[i++] = map.get(iterator.next());
 			}
 			srcFolder.copyMessages(amessage, trgFolder);
-			srcFolder.setFlags(amessage, new Flags(javax.mail.Flags.Flag.DELETED), true);
+			srcFolder.setFlags(amessage, new Flags(Flags.Flag.DELETED), true);
 		}
 		finally {
 			srcFolder.close(true);
diff --git a/core/src/main/java/lucee/runtime/net/rpc/client/WSClient.java b/core/src/main/java/lucee/runtime/net/rpc/client/WSClient.java
index 855c23c70f..313be4a3ee 100644
--- a/core/src/main/java/lucee/runtime/net/rpc/client/WSClient.java
+++ b/core/src/main/java/lucee/runtime/net/rpc/client/WSClient.java
@@ -31,7 +31,7 @@
 
 public interface WSClient extends Objects, Iteratorable {
 
-	public void addHeader(Object header) throws PageException; // Object instead of header because Java 11 no longer support javax.xml.soap.SOAPHeaderElement
+	public void addHeader(Object header) throws PageException; // Object instead of header because Java 11 no longer support javjak.xml.soap.SOAPHeaderElement
 
 	public Object callWithNamedValues(Config config, Collection.Key methodName, Struct arguments) throws PageException;
 
diff --git a/core/src/main/java/lucee/runtime/net/rpc/ref/WSClientReflector.java b/core/src/main/java/lucee/runtime/net/rpc/ref/WSClientReflector.java
index df7754ce78..906cbbcb59 100644
--- a/core/src/main/java/lucee/runtime/net/rpc/ref/WSClientReflector.java
+++ b/core/src/main/java/lucee/runtime/net/rpc/ref/WSClientReflector.java
@@ -159,9 +159,9 @@ public Iterator<Object> valueIterator() {
 	}
 
 	@Override
-	public void addHeader(Object header) throws PageException { // Object instead of header because Java 11 no longer support javax.xml.soap.SOAPHeaderElement
+	public void addHeader(Object header) throws PageException { // Object instead of header because Java 11 no longer support javjak.xml.soap.SOAPHeaderElement
 		try {
-			if (addHeader == null) addHeader = clazz.getMethod("addHeader", new Class[] { Class.forName("javax.xml.soap.SOAPHeaderElement") });
+			if (addHeader == null) addHeader = clazz.getMethod("addHeader", new Class[] { Class.forName("javax.xml.soap.SOAPHeaderElement") });/* JAVJAK */
 			addHeader.invoke(obj, new Object[] { header });
 		}
 		catch (Exception e) {
diff --git a/core/src/main/java/lucee/runtime/net/smtp/SMTPClient.java b/core/src/main/java/lucee/runtime/net/smtp/SMTPClient.java
index 3f657f5f31..39ef5644bc 100644
--- a/core/src/main/java/lucee/runtime/net/smtp/SMTPClient.java
+++ b/core/src/main/java/lucee/runtime/net/smtp/SMTPClient.java
@@ -49,7 +49,6 @@
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.MimePart;
-import javax.mail.internet.MimeUtility;
 
 import org.apache.commons.mail.DefaultAuthenticator;
 
@@ -461,12 +460,12 @@ private MimeMessageAndSession createMimeMessage(lucee.runtime.config.Config conf
 			props.put("mail.smtp.port", Caster.toString(port));
 		}
 		if (ssl) {
-			props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+			props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");/* JAVJAK */
 			props.put("mail.smtp.socketFactory.port", Caster.toString(port));
 			props.put("mail.smtp.socketFactory.fallback", "false");
 		}
 		else {
-			props.put("mail.smtp.socketFactory.class", "javax.net.SocketFactory");
+			props.put("mail.smtp.socketFactory.class", "javax.net.SocketFactory");/* JAVJAK */
 			props.remove("mail.smtp.socketFactory.port");
 			props.remove("mail.smtp.socketFactory.fallback");
 		}
@@ -604,29 +603,6 @@ else if (StringUtil.isEmpty(plainText)) {
 		return new MimeMessageAndSession(msg, sat, messageId);
 	}
 
-	/*
-	 * private static void addMailcaps(ClassLoader cl) { try { Class<?> cCM =
-	 * cl.loadClass("javax.activation.CommandMap"); Method getDefaultCommandMap =
-	 * cCM.getMethod("getDefaultCommandMap", CLASS_EMPTY); Object oMCM =
-	 * getDefaultCommandMap.invoke(null, OBJECT_EMPTY);
-	 * 
-	 * Method getMimeTypes = oMCM.getClass().getMethod("getMimeTypes", CLASS_EMPTY);
-	 * 
-	 * Method addMailcap = oMCM.getClass().getMethod("addMailcap", CLASS_STRING); addMailcap(oMCM,
-	 * addMailcap,"text/plain;;		x-java-content-handler=com.sun.mail.handlers.text_plain");
-	 * addMailcap(oMCM,
-	 * addMailcap,"text/html;;		x-java-content-handler=com.sun.mail.handlers.text_html");
-	 * addMailcap(oMCM,
-	 * addMailcap,"text/xml;;		x-java-content-handler=com.sun.mail.handlers.text_xml");
-	 * addMailcap(oMCM,
-	 * addMailcap,"multipart/*;;		x-java-content-handler=com.sun.mail.handlers.multipart_mixed; x-java-fallback-entry=true"
-	 * ); addMailcap(oMCM,
-	 * addMailcap,"message/rfc822;;	x-java-content-handler=com.sun.mail.handlers.message_rfc822"); }
-	 * catch(Throwable t) {ExceptionUtil.rethrowIfNecessary(t);} } private static void addMailcap(Object
-	 * oMCM, Method addMailcap, String value) throws IllegalAccessException, IllegalArgumentException,
-	 * InvocationTargetException { addMailcap.invoke(oMCM, new Object[]{value}); }
-	 */
-
 	private static String hash(Properties props) {
 		Enumeration<?> e = props.propertyNames();
 		java.util.List<String> names = new ArrayList<String>();
@@ -750,16 +726,16 @@ public MimeBodyPart toMimeBodyPart(Multipart mp, lucee.runtime.config.Config con
 		//
 		String fileName = att.getFileName();
 
-		//  Set to comment for LDEV-4249 because of JavaMail choosing best encoding by itself,
-		//  as specified in https://javaee.github.io/javamail/FAQ#encodefilename and it should be
-		//  set in very special cases for legacy purpose.
-		//  if (!StringUtil.isAscii(fileName)) {
-		//  	try {
-		//  		fileName = MimeUtility.encodeText(fileName, "UTF-8", null);
-		//  	}
-		//  	catch (UnsupportedEncodingException e) {
-		//  	} // that should never happen!
-		//  }
+		// Set to comment for LDEV-4249 because of JavaMail choosing best encoding by itself,
+		// as specified in https://javaee.github.io/javamail/FAQ#encodefilename and it should be
+		// set in very special cases for legacy purpose.
+		// if (!StringUtil.isAscii(fileName)) {
+		// try {
+		// fileName = MimeUtility.encodeText(fileName, "UTF-8", null);
+		// }
+		// catch (UnsupportedEncodingException e) {
+		// } // that should never happen!
+		// }
 
 		mbp.setFileName(fileName);
 		if (!StringUtil.isEmpty(att.getType())) mbp.setHeader("Content-Type", att.getType());
diff --git a/core/src/main/java/lucee/runtime/osgi/BundleBuilderFactory.java b/core/src/main/java/lucee/runtime/osgi/BundleBuilderFactory.java
index ad155491f8..a9a79bae31 100644
--- a/core/src/main/java/lucee/runtime/osgi/BundleBuilderFactory.java
+++ b/core/src/main/java/lucee/runtime/osgi/BundleBuilderFactory.java
@@ -468,7 +468,6 @@ public void handleEntry(Resource zipFile, ZipInputStream source, ZipEntry entry)
 					Attributes attrs = manifest.getMainAttributes();
 
 					// they are in bootdelegation
-					// ManifestUtil.removeFromList(attrs,"Import-Package","javax.*");
 					ManifestUtil.removeOptional(attrs, "Import-Package");
 
 					// ManifestUtil.removeFromList(attrs,"Import-Package","org.osgi.*");
diff --git a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
index 862eae9657..11d9b34fd2 100644
--- a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
+++ b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
@@ -40,6 +40,9 @@
 import java.util.Properties;
 import java.util.Set;
 
+import javax.servlet.Servlet;
+import javax.servlet.jsp.JspException;
+
 import org.apache.felix.framework.BundleWiringImpl.BundleClassLoader;
 import org.apache.felix.framework.Logger;
 import org.osgi.framework.Bundle;
@@ -2340,8 +2343,8 @@ public static List<File> getClassPathAsList() {
 
 		Set<String> set = new HashSet<>();
 		set.add(ClassUtil.getSourcePathForClass(CFMLEngineFactory.class, null));
-		set.add(ClassUtil.getSourcePathForClass(javax.servlet.jsp.JspException.class, null));
-		set.add(ClassUtil.getSourcePathForClass(javax.servlet.Servlet.class, null));
+		set.add(ClassUtil.getSourcePathForClass(JspException.class, null));
+		set.add(ClassUtil.getSourcePathForClass(Servlet.class, null));
 
 		List<File> list = new ArrayList<>();
 		for (String path: set) {
diff --git a/core/src/main/java/lucee/runtime/text/xml/XMLConstants.java b/core/src/main/java/lucee/runtime/text/xml/XMLConstants.java
index 128fbfd01a..5b1e911280 100755
--- a/core/src/main/java/lucee/runtime/text/xml/XMLConstants.java
+++ b/core/src/main/java/lucee/runtime/text/xml/XMLConstants.java
@@ -30,10 +30,6 @@ public interface XMLConstants {
 	public static final String FEATURE_EXTERNAL_PARAMETER_ENTITIES = "http://xml.org/sax/features/external-parameter-entities";
 	public static final String FEATURE_NONVALIDATING_LOAD_EXTERNAL_DTD = "http://apache.org/xml/features/nonvalidating/load-external-dtd";
 
-	// public static final String ACCESS_EXTERNAL_DTD = javax.xml.XMLConstants.ACCESS_EXTERNAL_DTD;
-	// public static final String ACCESS_EXTERNAL_SCHEMA =
-	// javax.xml.XMLConstants.ACCESS_EXTERNAL_SCHEMA;
-
-	public static final String ACCESS_EXTERNAL_DTD = "http://javax.xml.XMLConstants/property/accessExternalDTD";
-	public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
+	public static final String ACCESS_EXTERNAL_DTD = "http://javax.xml.XMLConstants/property/accessExternalDTD";/* JAVJAK */
+	public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";/* JAVJAK */
 }
\ No newline at end of file
diff --git a/core/src/main/java/lucee/runtime/type/scope/CGIImpl.java b/core/src/main/java/lucee/runtime/type/scope/CGIImpl.java
index b1c0d6880d..a7262c1957 100755
--- a/core/src/main/java/lucee/runtime/type/scope/CGIImpl.java
+++ b/core/src/main/java/lucee/runtime/type/scope/CGIImpl.java
@@ -258,7 +258,7 @@ else if (first == 'r') {
 					if (key.equals(KeyConstants._remote_host)) return store(key, toString(req.getRemoteHost()));
 					if (key.equals(KeyConstants._request_method)) return store(key, req.getMethod());
 					if (key.equals(KeyConstants._request_url)) return store(key, ReqRspUtil.getRequestURL(req, true));
-					if (key.equals(KeyConstants._request_uri)) return store(key, toString(req.getAttribute("javax.servlet.include.request_uri")));
+					if (key.equals(KeyConstants._request_uri)) return store(key, toString(req.getAttribute("javax.servlet.include.request_uri")));/* JAVJAK */
 					// we do not store this, to be as backward compatible as possible.
 					if (key.getUpperString().startsWith("REDIRECT_")) {
 						// from attributes (key sensitive)
@@ -289,7 +289,7 @@ else if (first == 's') {
 				}
 				else if (first == 'p') {
 					if (key.equals(KeyConstants._path_info)) {
-						String pathInfo = Caster.toString(req.getAttribute("javax.servlet.include.path_info"), null);
+						String pathInfo = Caster.toString(req.getAttribute("javax.servlet.include.path_info"), null);/* JAVJAK */
 						if (StringUtil.isEmpty(pathInfo)) pathInfo = Caster.toString(req.getHeader("xajp-path-info"), null);
 						if (StringUtil.isEmpty(pathInfo)) pathInfo = req.getPathInfo();
 						if (StringUtil.isEmpty(pathInfo)) {
diff --git a/core/src/main/java/lucee/runtime/type/scope/CGIImplReadOnly.java b/core/src/main/java/lucee/runtime/type/scope/CGIImplReadOnly.java
index dfaffdf03f..3a577e3608 100644
--- a/core/src/main/java/lucee/runtime/type/scope/CGIImplReadOnly.java
+++ b/core/src/main/java/lucee/runtime/type/scope/CGIImplReadOnly.java
@@ -226,7 +226,7 @@ else if (first == 'r') {
 					catch (Exception e) {
 					}
 				}
-				if (key.equals(KeyConstants._request_uri)) return toString(req.getAttribute("javax.servlet.include.request_uri"));
+				if (key.equals(KeyConstants._request_uri)) return toString(req.getAttribute("javax.servlet.include.request_uri"));/* JAVJAK */
 				if (key.getUpperString().startsWith("REDIRECT_")) {
 					// from attributes (key sensitive)
 					Object value = req.getAttribute(key.getString());
@@ -257,7 +257,7 @@ else if (first == 's') {
 			}
 			else if (first == 'p') {
 				if (key.equals(KeyConstants._path_info)) {
-					String pathInfo = Caster.toString(req.getAttribute("javax.servlet.include.path_info"), null);
+					String pathInfo = Caster.toString(req.getAttribute("javax.servlet.include.path_info"), null);/* JAVJAK */
 					if (StringUtil.isEmpty(pathInfo)) pathInfo = Caster.toString(req.getHeader("xajp-path-info"), null);
 					if (StringUtil.isEmpty(pathInfo)) pathInfo = req.getPathInfo();
 					if (StringUtil.isEmpty(pathInfo)) {
diff --git a/core/src/main/java/lucee/runtime/type/scope/CookieImpl.java b/core/src/main/java/lucee/runtime/type/scope/CookieImpl.java
index 638dc084dd..72ae910387 100755
--- a/core/src/main/java/lucee/runtime/type/scope/CookieImpl.java
+++ b/core/src/main/java/lucee/runtime/type/scope/CookieImpl.java
@@ -82,7 +82,6 @@ public final class CookieImpl extends ScopeSupport implements Cookie, ScriptProt
 	private static Method isPartitioned;
 	private static Method setPartitioned;
 
-
 	/**
 	 * constructor for the Cookie Scope
 	 */
@@ -124,7 +123,7 @@ public Object set(Collection.Key key, Object value) throws PageException {
 		return value;
 	}
 
-	private void set(Config config, javax.servlet.http.Cookie cookie) {
+	private void set(Config config, javax.servlet.http.Cookie cookie) {/* JAVJAK */
 
 		String name = StringUtil.toLowerCase(ReqRspUtil.decode(cookie.getName(), charset, false));
 		if (!raw.containsKey(name) || !StringUtil.isEmpty(cookie.getPath())) {
@@ -300,8 +299,8 @@ public void setCookieEL(Collection.Key key, Object value, int expires, boolean s
 		super.setEL(key, value);
 	}
 
-	private void _addCookie(Key key, String value, int expires, boolean secure, String path, String domain, boolean httpOnly, boolean preserveCase, Boolean encode,
-			short samesite, boolean partitioned) {
+	private void _addCookie(Key key, String value, int expires, boolean secure, String path, String domain, boolean httpOnly, boolean preserveCase, Boolean encode, short samesite,
+			boolean partitioned) {
 		String name = preserveCase ? key.getString() : key.getUpperString();
 
 		// build the value
@@ -313,27 +312,13 @@ private void _addCookie(Key key, String value, int expires, boolean secure, Stri
 		/* Secure */if (secure) sb.append(";Secure");
 		/* HTTPOnly */if (httpOnly) sb.append(";HttpOnly");
 		/* Partitioned */if (partitioned) sb.append(";Partitioned");
-		
+
 		String tmpSameSite = SessionCookieDataImpl.toSamesite(samesite);
 		/* Samesite */if (!StringUtil.isEmpty(tmpSameSite, true)) sb.append(";SameSite").append('=').append(tmpSameSite);
 		rsp.addHeader("Set-Cookie", sb.toString());
 
 	}
 
-	/*
-	 * private void _addCookieOld(Key key, String value, int expires, boolean secure, String path,
-	 * String domain, boolean httpOnly, boolean preserveCase, boolean encode) { String
-	 * name=preserveCase?key.getString():key.getUpperString(); if(encode) { name=enc(name);
-	 * value=enc(value); }
-	 * 
-	 * javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name,value);
-	 * cookie.setMaxAge(expires); cookie.setSecure(secure); cookie.setPath(path);
-	 * if(!StringUtil.isEmpty(domain,true))cookie.setDomain(domain); if(httpOnly) setHTTPOnly(cookie);
-	 * rsp.addCookie(cookie);
-	 * 
-	 * }
-	 */
-
 	private int toExpires(String expires) throws ExpressionException {
 		String str = StringUtil.toLowerCase(expires.toString());
 		if (str.equals("now")) return 0;
@@ -435,7 +420,7 @@ public void touchBeforeRequest(PageContext pc) {
 	public void touchAfterRequest(PageContext pc) {
 	}
 
-	public static void setHTTPOnly(javax.servlet.http.Cookie cookie) {
+	public static void setHTTPOnly(javax.servlet.http.Cookie cookie) {/* JAVJAK */
 		try {
 			if (setHttpOnly == null) {
 				setHttpOnly = cookie.getClass().getMethod("setHttpOnly", SET_HTTP_ONLY_ARGS_CLASSES);
@@ -447,7 +432,7 @@ public static void setHTTPOnly(javax.servlet.http.Cookie cookie) {
 		}
 	}
 
-	public static boolean isHTTPOnly(javax.servlet.http.Cookie cookie) {
+	public static boolean isHTTPOnly(javax.servlet.http.Cookie cookie) {/* JAVJAK */
 		try {
 			if (isHttpOnly == null) {
 				isHttpOnly = cookie.getClass().getMethod("isHttpOnly", IS_HTTP_ONLY_ARGS_CLASSES);
@@ -460,7 +445,7 @@ public static boolean isHTTPOnly(javax.servlet.http.Cookie cookie) {
 		}
 	}
 
-	public static void setPartitioned(javax.servlet.http.Cookie cookie) {
+	public static void setPartitioned(javax.servlet.http.Cookie cookie) {/* JAVJAK */
 		try {
 			if (setPartitioned == null) {
 				setPartitioned = cookie.getClass().getMethod("setPartitioned", SET_PARTITIONED_ARGS_CLASSES);
@@ -472,7 +457,7 @@ public static void setPartitioned(javax.servlet.http.Cookie cookie) {
 		}
 	}
 
-	public static boolean isPartitioned(javax.servlet.http.Cookie cookie) {
+	public static boolean isPartitioned(javax.servlet.http.Cookie cookie) {/* JAVJAK */
 		try {
 			if (isPartitioned == null) {
 				isPartitioned = cookie.getClass().getMethod("isPartitioned", IS_PARTITIONED_ARGS_CLASSES);
diff --git a/core/src/main/java/lucee/servlet/pic/PicServlet.java b/core/src/main/java/lucee/servlet/pic/PicServlet.java
index 1a4520c0dd..1356479e3b 100644
--- a/core/src/main/java/lucee/servlet/pic/PicServlet.java
+++ b/core/src/main/java/lucee/servlet/pic/PicServlet.java
@@ -46,8 +46,6 @@ public final class PicServlet extends HttpServlet {
 	/**
 	 * Interpretiert den Script-Name und laedt das entsprechende Bild aus den internen Resourcen.
 	 * 
-	 * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest,
-	 *      javax.servlet.http.HttpServletResponse)
 	 */
 	@Override
 	protected void service(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
diff --git a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagHelper.java b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagHelper.java
index d141664ea2..1bac2bd9c4 100755
--- a/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagHelper.java
+++ b/core/src/main/java/lucee/transformer/bytecode/statement/tag/TagHelper.java
@@ -60,8 +60,8 @@ public final class TagHelper {
 	private static final Type MISSING_ATTRIBUTE = Type.getType(MissingAttribute.class);
 	private static final Type MISSING_ATTRIBUTE_ARRAY = Type.getType(MissingAttribute[].class);
 	private static final Type BODY_TAG = Type.getType(BodyTag.class);
-	private static final Type TAG = Type.getType(javax.servlet.jsp.tagext.Tag.class);
-	private static final Type TRY_CATCH_FINALLY_TAG = Type.getType(javax.servlet.jsp.tagext.TryCatchFinally.class);
+	private static final Type TAG = Type.getType(javax.servlet.jsp.tagext.Tag.class);/* JAVJAK */
+	private static final Type TRY_CATCH_FINALLY_TAG = Type.getType(javax.servlet.jsp.tagext.TryCatchFinally.class);/* JAVJAK */
 	private static final Type TAG_UTIL = Type.getType(lucee.runtime.tag.TagUtil.class);
 
 	// TagUtil.setAttributeCollection(Tag, Struct)
@@ -307,7 +307,7 @@ public void _writeOut(BytecodeContext bc) {
 			// if (state!=Tag.SKIP_BODY)
 			Label endBody = new Label();
 			adapter.loadLocal(state);
-			adapter.push(javax.servlet.jsp.tagext.Tag.SKIP_BODY);
+			adapter.push(javax.servlet.jsp.tagext.Tag.SKIP_BODY);/* JAVJAK */
 			adapter.visitJumpInsn(Opcodes.IF_ICMPEQ, endBody);
 			// pc.initBody(tag, state);
 			adapter.loadArg(0);
@@ -325,7 +325,7 @@ public void _writeOut(BytecodeContext bc) {
 					 * ASMUtil.visitLabel(adapter, fcf.getFinalEntryLabel()); }
 					 */
 					adapter.loadLocal(state);
-					adapter.push(javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE);
+					adapter.push(javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE);/* JAVJAK */
 					adapter.visitJumpInsn(Opcodes.IF_ICMPEQ, endIf);
 					// ... pc.popBody();
 					adapter.loadArg(0);
@@ -384,7 +384,7 @@ public void _writeOut(BytecodeContext bc) {
 		adapter.loadLocal(currLocal);
 		ASMUtil.invoke(fromBundle ? ASMUtil.INTERFACE : ASMUtil.VIRTUAL, adapter, currType, DO_END_TAG);
 		// adapter.invokeVirtual(currType, DO_END_TAG);
-		adapter.push(javax.servlet.jsp.tagext.Tag.SKIP_PAGE);
+		adapter.push(javax.servlet.jsp.tagext.Tag.SKIP_PAGE);/* JAVJAK */
 		adapter.visitJumpInsn(Opcodes.IF_ICMPNE, endDoEndTag);
 		adapter.push(Abort.SCOPE_PAGE);
 		adapter.invokeStatic(ABORT, NEW_INSTANCE);