diff --git a/pom.xml b/pom.xml
index 382493189d1..d132d5b787e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,6 @@
         <org.snakeyaml.snakeyaml-engine.version>2.6</org.snakeyaml.snakeyaml-engine.version>
 
         <!-- Others -->
-        <commons-lang.version>2.6</commons-lang.version>
         <apacheds.version>2.0.0.AM26</apacheds.version>
         <apacheds.codec.version>2.0.0</apacheds.codec.version>
         <google.zxing.version>3.4.0</google.zxing.version>
@@ -1207,11 +1206,6 @@
                 <artifactId>kerby-asn1</artifactId>
                 <version>${org.apache.kerby.kerby-asn1.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>${commons-lang.version}</version>
-            </dependency>
 
             <!-- used in server-dist build while provisioning the distribution -->
             <dependency>
diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml
index 0d3ac4ed12c..7e2e899c1f2 100644
--- a/util/embedded-ldap/pom.xml
+++ b/util/embedded-ldap/pom.xml
@@ -39,10 +39,6 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java
index 721a09a0a42..5e54dc91af6 100644
--- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java
+++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java
@@ -19,13 +19,12 @@ package org.keycloak.util.ldap;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.commons.lang3.text.StrSubstitutor;
 import org.apache.directory.api.ldap.model.entry.DefaultEntry;
 import org.apache.directory.api.ldap.model.exception.LdapEntryAlreadyExistsException;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.ldif.LdifEntry;
 import org.apache.directory.api.ldap.model.ldif.LdifReader;
-import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.interceptor.Interceptor;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -363,13 +362,9 @@ public class LDAPEmbeddedServer {
 
         // Find LDIF file on filesystem or classpath ( if it's like classpath:ldap/users.ldif )
         InputStream is = FindFile.findFile(ldifFile);
-        if (is == null) {
-            throw new IllegalStateException("LDIF file not found on classpath or on file system. Location was: " + ldifFile);
-        }
 
         final String ldifContent = StrSubstitutor.replace(StreamUtil.readString(is), map);
         log.info("Content of LDIF: " + ldifContent);
-        final SchemaManager schemaManager = directoryService.getSchemaManager();
 
         importLdifContent(directoryService, ldifContent);
     }