diff --git a/.github/badges/jacoco.svg b/.github/badges/jacoco.svg
index fdf3f279b..c1268686a 100644
--- a/.github/badges/jacoco.svg
+++ b/.github/badges/jacoco.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="coverage: 59.8%"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="106" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="45" height="20" fill="#e05d44"/><rect width="106" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="825" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">59.8%</text><text x="825" y="140" transform="scale(.1)" fill="#fff" textLength="350">59.8%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="coverage: 60.9%"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="106" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="45" height="20" fill="#fe7d37"/><rect width="106" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="825" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">60.9%</text><text x="825" y="140" transform="scale(.1)" fill="#fff" textLength="350">60.9%</text></g></svg>
\ No newline at end of file
diff --git a/.github/coverage/jacoco.csv b/.github/coverage/jacoco.csv
index 0ee677b7d..68e04afcb 100644
--- a/.github/coverage/jacoco.csv
+++ b/.github/coverage/jacoco.csv
@@ -110,16 +110,6 @@ Portal-Core,org.auscope.portal.core.view.knownlayer,CSWTitleFilterRecordSelector
 Portal-Core,org.auscope.portal.core.view.knownlayer,WMSSelector,83,83,17,11,21,18,16,8,6,4
 Portal-Core,org.auscope.portal.core.services.vocabs,VocabularyServiceItem,15,18,0,0,7,7,4,3,4,3
 Portal-Core,org.auscope.portal.core.services.responses.sos,SOSResponse,15,0,0,0,6,0,3,0,3,0
-Portal-Core,org.auscope.portal.core.services.cloud,CloudComputeService,52,47,0,0,19,18,13,7,13,7
-Portal-Core,org.auscope.portal.core.services.cloud,FileStagingService,159,424,14,36,35,92,16,30,4,17
-Portal-Core,org.auscope.portal.core.services.cloud,CloudStorageServiceJClouds.new Supplier() {...},13,0,0,0,2,0,2,0,2,0
-Portal-Core,org.auscope.portal.core.services.cloud,STSRequirement,0,21,0,0,0,4,0,1,0,1
-Portal-Core,org.auscope.portal.core.services.cloud,CloudComputeServiceAws,467,383,51,22,95,61,39,14,8,8
-Portal-Core,org.auscope.portal.core.services.cloud,CloudComputeServiceNectar,475,207,47,6,102,40,36,7,11,5
-Portal-Core,org.auscope.portal.core.services.cloud,CloudStorageServiceJClouds,614,394,58,22,143,92,45,15,9,11
-Portal-Core,org.auscope.portal.core.services.cloud,CloudStorageService,72,127,1,5,29,33,18,15,17,13
-Portal-Core,org.auscope.portal.core.services.cloud,CloudComputeService.ProviderType,0,21,0,0,0,4,0,1,0,1
-Portal-Core,org.auscope.portal.core.services.cloud,CloudComputeService.InstanceStatus,0,21,0,0,0,4,0,1,0,1
 Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesRecord_1_3_0,109,378,11,20,32,95,13,25,2,20
 Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesWMSLayer_1_3_0,125,211,22,16,24,47,17,12,3,7
 Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesRecord_1_1_1,118,331,11,16,35,85,14,21,3,18
@@ -130,8 +120,6 @@ Portal-Core,org.auscope.portal.core.uifilter.optional.xpath,AbstractXPathFilter,
 Portal-Core,org.auscope.portal.core.uifilter.optional.xpath,UIDropDownSelectList,37,0,0,0,15,0,6,0,6,0
 Portal-Core,org.auscope.portal.core.uifilter.optional.xpath,UITextBox,17,0,0,0,7,0,2,0,2,0
 Portal-Core,org.auscope.portal.core.uifilter.optional.xpath,UIDate,17,0,0,0,7,0,2,0,2,0
-Portal-Core,org.auscope.portal.core.services.cloud.monitor,JobStatusException,6,79,0,2,2,16,2,4,2,3
-Portal-Core,org.auscope.portal.core.services.cloud.monitor,JobStatusMonitor,12,115,1,9,3,30,1,8,0,4
 Portal-Core,org.auscope.portal.core.services.admin,EndpointAndSelector,52,52,12,10,12,18,10,7,2,4
 Portal-Core,org.auscope.portal.core.services.admin,AdminService,155,398,2,14,29,78,4,12,3,5
 Portal-Core,org.auscope.portal.core.services.admin,AdminService.new AdminService.ResponseValidator() {...},21,35,0,0,3,8,0,2,0,2
@@ -152,7 +140,6 @@ Portal-Core,org.auscope.portal.core.services.csw,ViewGriddedCSWRecordFactory,33,
 Portal-Core,org.auscope.portal.core.services.csw,CSWRecordsHostFilter,14,27,3,3,6,6,4,2,1,2
 Portal-Core,org.auscope.portal.core.services.namespaces,WFSNamespaceContext,0,27,0,0,0,6,0,1,0,1
 Portal-Core,org.auscope.portal.core.services.namespaces,VocabNamespaceContext,0,75,0,0,0,14,0,1,0,1
-Portal-Core,org.auscope.portal.core.services.namespaces,AWSEC2NamespaceContext,9,0,0,0,3,0,1,0,1,0
 Portal-Core,org.auscope.portal.core.services.namespaces,CSWNamespaceContext,0,69,0,0,0,13,0,1,0,1
 Portal-Core,org.auscope.portal.core.services.namespaces,IterableNamespace,13,34,1,5,3,9,3,5,2,3
 Portal-Core,org.auscope.portal.core.services.namespaces,ServiceNamespaceContext,3,10,0,0,1,3,1,2,1,2
@@ -160,13 +147,6 @@ Portal-Core,org.auscope.portal.core.services.namespaces,OGCNamespaceContext,0,9,
 Portal-Core,org.auscope.portal.core.services.namespaces,WCSNamespaceContext,0,27,0,0,0,6,0,1,0,1
 Portal-Core,org.auscope.portal.core.services.namespaces,ErmlNamespaceContext,30,21,2,0,7,5,2,1,1,1
 Portal-Core,org.auscope.portal.core.services.namespaces,XsdNamespace,27,0,0,0,6,0,1,0,1,0
-Portal-Core,org.auscope.portal.core.cloud,CloudFileInformation,22,45,0,0,9,14,5,5,5,5
-Portal-Core,org.auscope.portal.core.cloud,ComputeType,44,14,0,0,19,5,12,1,12,1
-Portal-Core,org.auscope.portal.core.cloud,MachineImage,74,0,0,0,27,0,15,0,15,0
-Portal-Core,org.auscope.portal.core.cloud,CloudJob,77,88,1,1,29,32,17,20,16,20
-Portal-Core,org.auscope.portal.core.cloud,StagedFile,14,56,1,5,7,12,4,9,3,7
-Portal-Core,org.auscope.portal.core.cloud,StagingInformation,4,9,0,0,2,4,1,2,1,2
-Portal-Core,org.auscope.portal.core.cloud,CloudDirectoryInformation,99,0,6,0,34,0,16,0,13,0
 Portal-Core,org.auscope.portal.core.uifilter,Predicate,0,33,0,0,0,2,0,1,0,1
 Portal-Core,org.auscope.portal.core.uifilter,AbstractBaseFilter,29,0,0,0,11,0,8,0,8,0
 Portal-Core,org.auscope.portal.core.uifilter,GenericFilter,186,107,19,13,42,24,18,8,5,5
@@ -219,7 +199,7 @@ Portal-Core,org.auscope.portal.core.services,WFSGml32Service,22,0,0,0,4,0,2,0,2,
 Portal-Core,org.auscope.portal.core.services,KnownLayerService,427,327,52,33,94,75,31,22,4,6
 Portal-Core,org.auscope.portal.core.services,CSWCacheService,394,0,32,0,89,0,35,0,19,0
 Portal-Core,org.auscope.portal.core.services,GoogleCloudMonitoringCachedService,84,19,6,0,19,7,6,3,3,3
-Portal-Core,org.auscope.portal.core.services,PortalServiceException,24,34,0,0,10,14,4,6,4,6
+Portal-Core,org.auscope.portal.core.services,PortalServiceException,31,27,0,0,13,11,5,5,5,5
 Portal-Core,org.auscope.portal.core.services,CSWService,104,98,5,7,23,24,5,5,0,4
 Portal-Core,org.auscope.portal.core.services,BaseWFSService,113,298,5,19,21,64,10,13,5,6
 Portal-Core,org.auscope.portal.core.services,LocalCSWFilterService,76,642,11,77,16,148,12,44,2,8
@@ -245,7 +225,7 @@ Portal-Core,org.auscope.portal.core.util,DateUtil.TimeField,0,33,0,0,0,2,0,1,0,1
 Portal-Core,org.auscope.portal.core.util,SLDLoader,137,84,11,9,29,22,10,5,3,2
 Portal-Core,org.auscope.portal.core.util,DOMUtil,3,136,0,2,1,37,1,9,1,8
 Portal-Core,org.auscope.portal.core.util,HttpUtil,92,48,4,2,19,7,5,2,3,1
-Portal-Core,org.auscope.portal.core.util,TextUtil,58,50,11,3,10,11,10,3,4,2
+Portal-Core,org.auscope.portal.core.util,TextUtil,63,45,12,2,11,10,11,2,5,1
 Portal-Core,org.auscope.portal.core.util,DateUtil,79,102,20,0,18,28,13,3,3,3
 Portal-Core,org.auscope.portal.core.util,GeoJsonPolygonUtils,296,0,42,0,69,0,29,0,8,0
 Portal-Core,org.auscope.portal.core.util,CSVUtil,20,158,4,14,4,32,4,10,0,5
diff --git a/.github/coverage/percentage.txt b/.github/coverage/percentage.txt
index 31e775ae3..2e6af9008 100644
--- a/.github/coverage/percentage.txt
+++ b/.github/coverage/percentage.txt
@@ -1 +1 @@
-59.8567
+60.9471