diff --git a/smp-server-library/database/migration from 3.0.x to 4.0.0/mysql-3.0_4.0.sql b/smp-server-library/database/migration from 3.0.x to 4.0.0/mysql_3.0_4.0.sql
similarity index 100%
rename from smp-server-library/database/migration from 3.0.x to 4.0.0/mysql-3.0_4.0.sql
rename to smp-server-library/database/migration from 3.0.x to 4.0.0/mysql_3.0_4.0.sql
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
index 5bafa7c6a87206bd7f699f8c960a49ca3c8547e4..0f8e49333a5a80b267c2d64c127507c9d61103e1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
@@ -29,7 +29,7 @@ public class DomainDao extends BaseDao<DBDomain> {
 
     /**
      * Returns the only single record from smp_domain table.
-     * Returns Optional.empty() if there is 0 or more than 1 records present.
+     * Returns Optional.empty() if there is more than 1 records present.
      *
      * @return the only single record from smp_domain table
      * @throws IllegalStateException if no domain is configured
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
index c8da531666bad30e5a27eef53e860c3261f98a56..4b03bcf4763fb7bf1850c7501bc6e2c5480b9e02 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
@@ -23,7 +23,6 @@ import eu.europa.ec.edelivery.smp.exceptions.NotFoundException;
 import eu.europa.ec.edelivery.smp.exceptions.UnknownUserException;
 import eu.europa.ec.edelivery.smp.exceptions.WrongInputFieldException;
 import eu.europa.ec.edelivery.smp.sml.SmlConnector;
-import org.apache.commons.lang3.StringUtils;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ParticipantIdentifierType;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ServiceGroup;
 import org.slf4j.Logger;