diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/HandshakeRequestData.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/HandshakeRequestData.java
index 36f38f0b1ed78ff5bf7ec76c5ae6f8b74f10039d..d1b7489ecca099585441978f531f894049baa0ff 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/HandshakeRequestData.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/HandshakeRequestData.java
@@ -14,13 +14,14 @@
 
 package org.opengroup.osdu.notification.provider.azure.models;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class HandshakeRequestData {
 
     private String validationCode;
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationData.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationData.java
index 1895248fa717ddab5705d4ee42b95e523f4004ad..45437a5e3b9625011fbb57533bf5a71b5fb64392 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationData.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationData.java
@@ -15,6 +15,7 @@
 package org.opengroup.osdu.notification.provider.azure.models;
 
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,8 +23,8 @@ import lombok.NoArgsConstructor;
 import java.util.Map;
 
 @Data
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class NotificationData {
 
     private String data;
@@ -31,9 +32,5 @@ public class NotificationData {
     private Map<String,String> attributes;
 
     private String messageId;
-
-    String validationCode;
-
-    String validationUrl;
 }
 
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationRequest.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationRequest.java
index 636c92028840d936073f12e6633d8ff020ee2466..32236c6e234268a2e0a92d05aa423661819387ff 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationRequest.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationRequest.java
@@ -15,13 +15,14 @@
 package org.opengroup.osdu.notification.provider.azure.models;
 
 import com.google.gson.JsonObject;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class NotificationRequest {
 
     private String id;
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
index d81b4ea0ebcd807727e3f452061f7494d997389a..0d1a403365483e8603c43085faf2cf63318c5215 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
@@ -32,7 +32,6 @@ import org.springframework.web.context.annotation.RequestScope;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.util.Base64;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -59,7 +58,8 @@ public class EventGridRequestBodyExtractor implements IPubsubRequestBodyExtracto
     private HandshakeRequestData handshakeRequestData;
     private boolean isHandshakeRequest;
 
-    public EventGridRequestBodyExtractor(@Autowired HttpServletRequest httpServletRequest, @Autowired JaxRsDpsLog log) {
+    @Autowired
+    public EventGridRequestBodyExtractor(HttpServletRequest httpServletRequest, JaxRsDpsLog log) {
         this.httpServletRequest = httpServletRequest;
         this.log = log;
         this.notificationRequest = extractNotificationRequestFromHttpRequest();
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AppProperties.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AppProperties.java
index 8d751e083b69e353ce87938107eaaf3ade42c426..59736e877ba4cb9ebf5ac417f613e930eca92a39 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AppProperties.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AppProperties.java
@@ -15,10 +15,8 @@
 
 package org.opengroup.osdu.notification.provider.azure.util;
 
-import com.azure.cosmos.CosmosClient;
 import com.azure.security.keyvault.secrets.SecretClient;
 import com.azure.security.keyvault.secrets.models.KeyVaultSecret;
-import org.opengroup.osdu.azure.KeyVaultFacade;
 import org.opengroup.osdu.notification.provider.interfaces.IAppProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;