diff --git a/cedar-impex-server-application/src/main/java/org/metadatacenter/impex/util/Constants.java b/cedar-impex-server-application/src/main/java/org/metadatacenter/impex/util/Constants.java
index 3fe717e..9d78d82 100644
--- a/cedar-impex-server-application/src/main/java/org/metadatacenter/impex/util/Constants.java
+++ b/cedar-impex-server-application/src/main/java/org/metadatacenter/impex/util/Constants.java
@@ -1,7 +1,5 @@
 package org.metadatacenter.impex.util;
 
-import org.metadatacenter.model.BiboStatus;
-
 public final class Constants {
 
   public static final String UPLOAD_FOLDER_NAME = "impex-upload";
diff --git a/cedar-impex-server-core/pom.xml b/cedar-impex-server-core/pom.xml
index ae39421..6730fce 100644
--- a/cedar-impex-server-core/pom.xml
+++ b/cedar-impex-server-core/pom.xml
@@ -52,8 +52,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
     </dependency>
 
     <dependency>
diff --git a/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/imp/cadsr/CadsrFileImportStatus.java b/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/imp/cadsr/CadsrFileImportStatus.java
index 4f144b1..9b0ed3f 100644
--- a/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/imp/cadsr/CadsrFileImportStatus.java
+++ b/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/imp/cadsr/CadsrFileImportStatus.java
@@ -1,7 +1,6 @@
 package org.metadatacenter.impex.imp.cadsr;
 
 import java.time.LocalTime;
-import java.util.Date;
 
 public class CadsrFileImportStatus {
 
diff --git a/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowData.java b/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowData.java
index 142f96e..39da5d7 100644
--- a/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowData.java
+++ b/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowData.java
@@ -1,7 +1,6 @@
 package org.metadatacenter.impex.upload;
 
 import java.io.InputStream;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowUploadUtil.java b/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowUploadUtil.java
index 38a4481..e791cca 100644
--- a/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowUploadUtil.java
+++ b/cedar-impex-server-core/src/main/java/org/metadatacenter/impex/upload/FlowUploadUtil.java
@@ -4,8 +4,6 @@
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -151,6 +149,6 @@ public static String getFileLocalFolderPath(String uploadLocalFolderPath, String
   }
 
   public static String getLastFragmentOfUrl(String url) {
-    return url.substring(url.lastIndexOf("/") + 1, url.length());
+    return url.substring(url.lastIndexOf("/") + 1);
   }
 }