diff --git a/pom.xml b/pom.xml
index d1d69a2..fb884d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,16 +45,6 @@
   </scm>
 
   <properties>
-
-    <!--
-    As discussed on the mailing list, it is fine to maintain at Apache APIs which are also
-    IMPLs such as JavaMail, Activation for instance.
-
-    For APIs only, it's fine to use Eclipse Jakarta equivalent. From a license point of view
-    the EPL is compatible.
-
-    For APIs available in Tomcat such as Servlet, JSP, EL, we want to give Tomcat the priority.
-    -->
     <geronimo-annotation_1.3_spec.version>1.3</geronimo-annotation_1.3_spec.version>
     <geronimo-atinject_1.0_spec.version>1.2</geronimo-atinject_1.0_spec.version>
     <geronimo-concurrent_1.0_spec.version>1.0-alpha-1</geronimo-concurrent_1.0_spec.version>
@@ -84,8 +74,6 @@
     <geronimo-ws-metadata_2.0_spec.version>1.1.3</geronimo-ws-metadata_2.0_spec.version>
     <geronimo-interceptor_1.2_spec.version>1.2</geronimo-interceptor_1.2_spec.version>
 
-    <!-- Jakarta APIs -->
-
     <!-- We use servlet, jsp, jaspic, websocket, el straight from Tomcat APIs -->
     <tomcat.version>9.0.39</tomcat.version>
   </properties>
diff --git a/src/main/legal/META-INF/EPL/LICENSE b/src/main/legal/META-INF/EPL/LICENSE
deleted file mode 100644
index e0358f9..0000000
--- a/src/main/legal/META-INF/EPL/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-   
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-   
-      - Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-   
-      - Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-   
-      - Neither the name of the Eclipse Foundation, Inc. nor the names of its
-        contributors may be used to endorse or promote products derived
-        from this software without specific prior written permission.
-   
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/main/legal/META-INF/EPL/NOTICE b/src/main/legal/META-INF/EPL/NOTICE
deleted file mode 100644
index d6492f8..0000000
--- a/src/main/legal/META-INF/EPL/NOTICE
+++ /dev/null
@@ -1,33 +0,0 @@
-# Notices for Eclipse Project for JAF
-
-This content is produced and maintained by the Eclipse Project for JAF project.
-
-* Project home: https://projects.eclipse.org/projects/ee4j.jaf
-
-## Copyright
-
-All content is the property of the respective authors or their employers. For
-more information regarding authorship of content, please consult the listed
-source code repository logs.
-
-## Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Distribution License v. 1.0,
-which is available at http://www.eclipse.org/org/documents/edl-v10.php.
-
-SPDX-License-Identifier: BSD-3-Clause
-
-## Source Code
-
-The project maintains the following source code repositories:
-
-* https://github.com/eclipse-ee4j/jaf
-
-## Third-party Content
-
-This project leverages the following third party content.
-
-JUnit (4.12)
-
-* License: Eclipse Public License