diff --git a/spring-data-mongodb/src/main/java/org/baeldung/model/EmailAddress.java b/spring-data-mongodb/src/main/java/org/baeldung/model/EmailAddress.java
index 095ce40c01..6db7d160d7 100644
--- a/spring-data-mongodb/src/main/java/org/baeldung/model/EmailAddress.java
+++ b/spring-data-mongodb/src/main/java/org/baeldung/model/EmailAddress.java
@@ -9,18 +9,11 @@ public class EmailAddress {
     private String id;
     private String value;
 
-    public EmailAddress() {
-    }
-
-    public EmailAddress(String value) {
-        this.value = value;
-    }
-
     public String getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(final String id) {
         this.id = id;
     }
 
@@ -28,7 +21,7 @@ public class EmailAddress {
         return value;
     }
 
-    public void setValue(String value) {
+    public void setValue(final String value) {
         this.value = value;
     }
 }
diff --git a/spring-data-mongodb/src/main/java/org/baeldung/model/User.java b/spring-data-mongodb/src/main/java/org/baeldung/model/User.java
index 70d97d3417..e5977c658a 100644
--- a/spring-data-mongodb/src/main/java/org/baeldung/model/User.java
+++ b/spring-data-mongodb/src/main/java/org/baeldung/model/User.java
@@ -26,15 +26,6 @@ public class User {
     @CascadeSave
     private EmailAddress emailAddress;
 
-    public User() {
-    }
-
-    public User(String name, Integer age, String value) {
-        this.name = name;
-        this.age = age;
-        this.emailAddress = new EmailAddress(value);
-    }
-
     public String getId() {
         return id;
     }
diff --git a/spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/MongoTemplateQueryIntegrationTest.java b/spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/MongoTemplateQueryIntegrationTest.java
index c23e981294..f0185e97a4 100644
--- a/spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/MongoTemplateQueryIntegrationTest.java
+++ b/spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/MongoTemplateQueryIntegrationTest.java
@@ -137,7 +137,7 @@ public class MongoTemplateQueryIntegrationTest {
 
     @Test
     public void givenUserExistsWithIndexAddedFromMapping_whenCheckingIndex_thenIndexIsExisted() {
-        User user = new User();
+        final User user = new User();
         user.setName("Brendan");
         EmailAddress emailAddress = new EmailAddress();
         emailAddress.setValue("a@gmail.com");
@@ -151,7 +151,7 @@ public class MongoTemplateQueryIntegrationTest {
 
     @Test
     public void whenSavingUserWithEmailAddress_thenUserandEmailAddressSaved() {
-        User user = new User();
+        final User user = new User();
         user.setName("Brendan");
         EmailAddress emailAddress = new EmailAddress();
         emailAddress.setValue("b@gmail.com");
@@ -163,7 +163,7 @@ public class MongoTemplateQueryIntegrationTest {
 
     @Test
     public void givenUserExistsWithIndexAddedFromCode_whenCheckingIndex_thenIndexIsExisted() {
-        User user = new User();
+        final User user = new User();
         user.setName("Brendan");
         mongoTemplate.indexOps(User.class).ensureIndex(new Index().on("name", Direction.ASC));
         mongoTemplate.insert(user);