diff --git a/src/main/java/org/auscope/portal/server/config/LayerFactory.java b/src/main/java/org/auscope/portal/server/config/LayerFactory.java
index bc2847e8c..44d253881 100644
--- a/src/main/java/org/auscope/portal/server/config/LayerFactory.java
+++ b/src/main/java/org/auscope/portal/server/config/LayerFactory.java
@@ -302,7 +302,6 @@ KnownLayer annotateLayer(String id) {
                         case "initialBBox": {
                             JSONArray bboxGeoJson = new JSONArray();
                             
-                            ArrayList x2 = (ArrayList) v1;
                             ArrayList x3 = (ArrayList) ((ArrayList) v1).get(0);
                             int len = x3.size();
                             if (len == 4) {
@@ -564,9 +563,6 @@ else if (cswKey.startsWith("serviceNames")) {
                                         if (sk2.startsWith("options")) {
                                             ArrayList x2 = (ArrayList) sv2;
                                             x2.forEach((item) -> {
-                                                ArrayList x3 = (ArrayList) item;
-                                                String i1 = (String) x3.get(0);
-                                                String i2 = (String) x3.get(1);
                                                 filter.selectlist.options.add(item);
                                             });
                                         }
@@ -585,9 +581,6 @@ else if (cswKey.startsWith("serviceNames")) {
                                         if (sk2.startsWith("options")) {
                                             ArrayList x2 = (ArrayList) sv2;
                                             x2.forEach((item) -> {
-                                                ArrayList x3 = (ArrayList) item;
-                                                String i1 = (String) x3.get(0);
-                                                String i2 = (String) x3.get(1);
                                                 filter.mandatorylist.options.add(item);
                                             });
                                         }
diff --git a/src/main/java/org/auscope/portal/server/web/controllers/SF0BoreholeController.java b/src/main/java/org/auscope/portal/server/web/controllers/SF0BoreholeController.java
index 690bc8b47..c61d24ae0 100644
--- a/src/main/java/org/auscope/portal/server/web/controllers/SF0BoreholeController.java
+++ b/src/main/java/org/auscope/portal/server/web/controllers/SF0BoreholeController.java
@@ -116,6 +116,7 @@ public void doNVCLBoreholeViewCSVDownload(String serviceUrl,String typeName,
                 filterString = filter;
                 result = wfsService.downloadCSVByPolygonFilter(serviceUrl, typeName, filterString, maxFeatures);
                 // LJ filtering out records of nvclCollection == false
+                @SuppressWarnings("unused")
                 int totalReturnLine = nvclDataService.nvclCollectionFilter(result, outputStream);
                 //System.out.print(totalReturnLine);
             } else {
diff --git a/src/main/java/org/auscope/portal/server/web/controllers/VocabController.java b/src/main/java/org/auscope/portal/server/web/controllers/VocabController.java
index 059907bee..59a1c69ab 100644
--- a/src/main/java/org/auscope/portal/server/web/controllers/VocabController.java
+++ b/src/main/java/org/auscope/portal/server/web/controllers/VocabController.java
@@ -18,7 +18,6 @@
 import org.springframework.web.servlet.ModelAndView;
 
 import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Selector;
 import org.apache.jena.rdf.model.SimpleSelector;
diff --git a/src/test/java/org/auscope/portal/server/web/controllers/MyHttpResponse.java b/src/test/java/org/auscope/portal/server/web/controllers/MyHttpResponse.java
index 266be8833..5de46f03e 100644
--- a/src/test/java/org/auscope/portal/server/web/controllers/MyHttpResponse.java
+++ b/src/test/java/org/auscope/portal/server/web/controllers/MyHttpResponse.java
@@ -12,7 +12,6 @@
 import org.apache.http.params.HttpParams;
 import org.auscope.portal.core.server.http.HttpClientResponse;
 
-@SuppressWarnings("deprecation")
 public class MyHttpResponse extends HttpClientResponse {
     InputStream content;
     int statusCode;
diff --git a/src/test/java/org/auscope/portal/server/web/controllers/TestVocabController.java b/src/test/java/org/auscope/portal/server/web/controllers/TestVocabController.java
index 6bbe6ce86..df24303ea 100644
--- a/src/test/java/org/auscope/portal/server/web/controllers/TestVocabController.java
+++ b/src/test/java/org/auscope/portal/server/web/controllers/TestVocabController.java
@@ -1,29 +1,22 @@
 package org.auscope.portal.server.web.controllers;
 
-import java.util.Arrays;
+
 import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
 import java.util.ArrayList;
 
 import org.auscope.portal.core.services.VocabularyFilterService;
 import org.auscope.portal.core.test.PortalTestClass;
-import org.auscope.portal.server.web.controllers.VocabController;
+
 import org.hamcrest.Matcher;
 import org.jmock.Expectations;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.ui.ModelMap;
+
 import org.springframework.web.servlet.ModelAndView;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.Selector;
 import org.apache.jena.rdf.model.SimpleSelector;
-import org.auscope.portal.core.services.PortalServiceException;
 import org.apache.jena.vocabulary.SKOS;
 
 import au.gov.geoscience.portal.services.vocabularies.VocabularyLookup;
diff --git a/src/test/java/org/auscope/portal/server/web/service/monitor/TestKnownLayerServiceStatusMonitor.java b/src/test/java/org/auscope/portal/server/web/service/monitor/TestKnownLayerServiceStatusMonitor.java
index ab2622e46..760d3eb9d 100644
--- a/src/test/java/org/auscope/portal/server/web/service/monitor/TestKnownLayerServiceStatusMonitor.java
+++ b/src/test/java/org/auscope/portal/server/web/service/monitor/TestKnownLayerServiceStatusMonitor.java
@@ -7,14 +7,12 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.auscope.portal.core.server.http.HttpServiceCaller;
 import org.auscope.portal.core.services.CSWCacheService;
 import org.auscope.portal.core.services.ElasticsearchService;
 import org.auscope.portal.core.services.GoogleCloudMonitoringCachedService;
 import org.auscope.portal.core.services.KnownLayerService;
 import org.auscope.portal.core.services.PortalServiceException;
 import org.auscope.portal.core.services.WMSService;
-import org.auscope.portal.core.services.responses.csw.AbstractCSWOnlineResource;
 import org.auscope.portal.core.services.responses.csw.CSWOnlineResourceImpl;
 import org.auscope.portal.core.services.responses.csw.CSWRecord;
 import org.auscope.portal.core.services.responses.stackdriver.ServiceStatusResponse;
@@ -49,7 +47,6 @@
 public class TestKnownLayerServiceStatusMonitor extends PortalTestClass {
 
     private GoogleCloudMonitoringCachedService mockStackDriverService = context.mock(GoogleCloudMonitoringCachedService.class);
-    private HttpServiceCaller mockHttpServiceCaller = context.mock(HttpServiceCaller.class);
     private ElasticsearchService mockElasticsearchService = context.mock(ElasticsearchService.class);
     private KnownLayerService knownLayerService;