diff --git a/ccm-bundle-devel/pom.xml b/ccm-bundle-devel/pom.xml
index 15c5c2b18..6f6c3b4df 100644
--- a/ccm-bundle-devel/pom.xml
+++ b/ccm-bundle-devel/pom.xml
@@ -63,13 +63,10 @@
        <!-- CCM Modules end -->
         
         <!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         
     </dependencies>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 897268500..ff021d971 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -103,13 +103,10 @@
         </dependency>
         
         <!-- Dependencies for log4j 2 -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/AbstractFolderTree.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/AbstractFolderTree.java
index 422e904e9..c49dc9584 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/AbstractFolderTree.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/AbstractFolderTree.java
@@ -115,12 +115,12 @@ abstract class AbstractFolderTree<T extends FolderTreeNode<T, P>, P extends Perm
         final Folder folder
     ) {
         final String folderPath = folderManager
-            .getFolderPath(folder)
-            .substring(
-                folderManager
-                    .getFolderPath(section.getRootDocumentsFolder())
-                    .length() - 1
-            );
+            .getFolderPath(folder);
+//            .substring(
+//                folderManager
+//                    .getFolderPath(section.getRootDocumentsFolder())
+//                    .length() - 1
+//            );
         final T node = newFolderTreeNode();
         node.setFolderId(folder.getObjectId());
         node.setUuid(folder.getUuid());
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 1103005b6..fe2bc1422 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -127,13 +127,10 @@
         </dependency>
 
         <!-- Dependencies for log4j 2 -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index 96910d62c..0448784f2 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -55,13 +55,10 @@
         </dependency>
 
         <!-- Dependencies for log4j 2 -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index f374c4cef..fbee7067b 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -98,13 +98,10 @@
             <artifactId>jackson-jaxrs-xml-provider</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>