diff --git a/device-detection.cloud/src/main/java/fiftyone/devicedetection/cloud/data/MultiDeviceDataCloud.java b/device-detection.cloud/src/main/java/fiftyone/devicedetection/cloud/data/MultiDeviceDataCloud.java
index 01932fe61..2a41ed429 100644
--- a/device-detection.cloud/src/main/java/fiftyone/devicedetection/cloud/data/MultiDeviceDataCloud.java
+++ b/device-detection.cloud/src/main/java/fiftyone/devicedetection/cloud/data/MultiDeviceDataCloud.java
@@ -40,7 +40,7 @@
  * Encapsulates a list of {@link DeviceData} instances which can be returned
  * by the 51Degrees cloud service when certain evidence is provided (e.g. TAC)
  */
-public class MultiDeviceDataCloud
+public final class MultiDeviceDataCloud
     extends AspectDataBase
     implements MultiProfileData<DeviceData> {
     private static final String DEVICE_LIST_KEY = "profiles";
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/CollectionConfigSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/CollectionConfigSwig.java
index 61c1ff4c3..1920cd109 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/CollectionConfigSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/CollectionConfigSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(CollectionConfigSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataCollectionSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataCollectionSwig.java
index 56c76a1a7..fe6297c30 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataCollectionSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataCollectionSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ComponentMetaDataCollectionSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataSwig.java
index 1be5d178b..90a7f7dae 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ComponentMetaDataSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ComponentMetaDataSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigBaseSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigBaseSwig.java
index c346a4ffb..0877abe4c 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigBaseSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigBaseSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ConfigBaseSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigDeviceDetectionSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigDeviceDetectionSwig.java
index ca4262ebb..d53e5b296 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigDeviceDetectionSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigDeviceDetectionSwig.java
@@ -20,7 +20,7 @@ protected static long getCPtr(ConfigDeviceDetectionSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigHashSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigHashSwig.java
index 813f74c88..ee7f5b640 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigHashSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ConfigHashSwig.java
@@ -20,7 +20,7 @@ protected static long getCPtr(ConfigHashSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/Date.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/Date.java
index 5a03d6a1c..cf03a3d68 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/Date.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/Date.java
@@ -21,7 +21,7 @@ protected static long getCPtr(Date obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineBaseSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineBaseSwig.java
index c7fb3c022..ba3e102a5 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineBaseSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineBaseSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(EngineBaseSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineDeviceDetectionSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineDeviceDetectionSwig.java
index fe72b3989..0fe75307d 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineDeviceDetectionSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineDeviceDetectionSwig.java
@@ -20,7 +20,7 @@ protected static long getCPtr(EngineDeviceDetectionSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineHashSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineHashSwig.java
index 55fca99de..a9de877de 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineHashSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/EngineHashSwig.java
@@ -20,7 +20,7 @@ protected static long getCPtr(EngineHashSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MapStringStringSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MapStringStringSwig.java
index 38cea6fb8..ee173b82a 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MapStringStringSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MapStringStringSwig.java
@@ -145,7 +145,7 @@ protected static long getCPtr(Iterator obj) {
       return (obj == null) ? 0 : obj.swigCPtr;
     }
   
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({"deprecation", "removal"})
     protected void finalize() {
       delete();
     }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MetaDataSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MetaDataSwig.java
index 8aa2ebe43..f5a3791f5 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MetaDataSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/MetaDataSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(MetaDataSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataCollectionSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataCollectionSwig.java
index 67c825d8a..bda8a3ac0 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataCollectionSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataCollectionSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ProfileMetaDataCollectionSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataSwig.java
index 03678ad16..1b871b55e 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ProfileMetaDataSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ProfileMetaDataSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataCollectionSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataCollectionSwig.java
index cedd5efdb..8bf512c95 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataCollectionSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataCollectionSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(PropertyMetaDataCollectionSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataSwig.java
index 5e0b34a59..b1a95e8bb 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/PropertyMetaDataSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(PropertyMetaDataSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/RequiredPropertiesConfigSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/RequiredPropertiesConfigSwig.java
index 0fae3d552..90819282e 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/RequiredPropertiesConfigSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/RequiredPropertiesConfigSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(RequiredPropertiesConfigSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataCollectionSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataCollectionSwig.java
index 3232e2aec..ce6e9dfe9 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataCollectionSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataCollectionSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ValueMetaDataCollectionSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataKeySwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataKeySwig.java
index 36b437f36..35a9b0617 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataKeySwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataKeySwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ValueMetaDataKeySwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataSwig.java
index 8b12842ca..74332bc81 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/ValueMetaDataSwig.java
@@ -21,7 +21,7 @@ protected static long getCPtr(ValueMetaDataSwig obj) {
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 
-  @SuppressWarnings("deprecation")
+  @SuppressWarnings({"deprecation", "removal"})
   protected void finalize() {
     delete();
   }
diff --git a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/VectorStringSwig.java b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/VectorStringSwig.java
index abddea741..88b8e1518 100644
--- a/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/VectorStringSwig.java
+++ b/device-detection.hash.engine.on-premise/src/main/java/fiftyone/devicedetection/hash/engine/onpremise/interop/swig/VectorStringSwig.java
@@ -36,6 +36,7 @@ public void close() {
     this.delete();
   }
 
+  @SuppressWarnings("this-escape")
   public VectorStringSwig(String[] initialElements) {
     this();
     reserve(initialElements.length);
@@ -45,6 +46,7 @@ public VectorStringSwig(String[] initialElements) {
     }
   }
 
+  @SuppressWarnings("this-escape")
   public VectorStringSwig(Iterable<String> initialElements) {
     this();
     for (String element : initialElements) {
diff --git a/pom.xml b/pom.xml
index 41fc012ac..bd92cc0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
                         <showWarnings>true</showWarnings>
                         <compilerArgs>
                             <arg>-Xlint:all,-try,-options</arg>
-<!--                            <arg>-Werror</arg>-->
+                            <arg>-Werror</arg>
                         </compilerArgs>
                     </configuration>
                 </plugin>