diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/Student.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/Student.java
deleted file mode 100644
index 9bd218c332..0000000000
--- a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/Student.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.baeldung.dependencyinjectiontypes;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Student {
-
-	private TeacherFinder teacherFinder;
-
-	@Autowired
-	public Student(TeacherFinder teacherFinder) {
-		this.teacherFinder = teacherFinder;
-	}
-
-	public String getTeacher() {
-        return teacherFinder.getTeacherFinder();
-    }
-	// business logic that actually uses the injected teacherFinders is omitted...
-}
-
diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/Student2.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/Student2.java
deleted file mode 100644
index e6724d82ec..0000000000
--- a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/Student2.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.baeldung.dependencyinjectiontypes;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Student2 {
-
-	private TeacherFinder teacherFinder;
-
-	@Autowired
-    public void setTeacherFinder(TeacherFinder teacherFinder) {
-        this.teacherFinder = teacherFinder;
-    }
-	
-	public String getTeacher() {
-        return teacherFinder.getTeacherFinder();
-    }
-
-}
\ No newline at end of file
diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TeacherFinder.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TeacherFinder.java
deleted file mode 100644
index b349dc19d0..0000000000
--- a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TeacherFinder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.dependencyinjectiontypes;
-public class TeacherFinder {
-
-    private String teacherFinder;
-
-	public String getTeacherFinder() {
-		return teacherFinder;
-	}
-
-	public void setTeacherFinder(String teacherFinder) {
-		this.teacherFinder = teacherFinder;
-	}
-
-   
-}
-
diff --git a/spring-core/src/main/java/com/baeldung/setterdi/Config.java b/spring-core/src/main/java/com/baeldung/setterdi/Config.java
index d61510971c..68c1ae12a2 100644
--- a/spring-core/src/main/java/com/baeldung/setterdi/Config.java
+++ b/spring-core/src/main/java/com/baeldung/setterdi/Config.java
@@ -1,58 +1,35 @@
-package com.baeldung.setterdi;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import com.baeldung.dependencyinjectiontypes.Student;
-import com.baeldung.dependencyinjectiontypes.Student2;
-import com.baeldung.dependencyinjectiontypes.TeacherFinder;
-import com.baeldung.setterdi.domain.Engine;
-import com.baeldung.setterdi.domain.Trailer;
-import com.baeldung.setterdi.domain.Transmission;
-
-@Configuration
-@ComponentScan("com.baeldung.setterdi")
-public class Config {
-
-    @Bean
-    public Engine engine() {
-        Engine engine = new Engine();
-        engine.setType("v8");
-        engine.setVolume(5);
-        return engine;
-    }
-
-    @Bean
-    public Transmission transmission() {
-        Transmission transmission = new Transmission();
-        transmission.setType("sliding");
-        return transmission;
-    }
-
-    @Bean
-    public Trailer trailer() {
-        Trailer trailer = new Trailer();
-        return trailer;
-    }
-    
-    @Bean 
-    public TeacherFinder teacherFinder(){
-    	TeacherFinder teacherFinder =new TeacherFinder();
-    	teacherFinder.setTeacherFinder("author");
-    	return teacherFinder;
-    }
-    
-    @Bean
-    public Student student() {
-        return new Student(teacherFinder());
-    }
- 
-    @Bean
-    public Student2 student2() {
-    	Student2 student2 = new Student2();
-    	student2.setTeacherFinder(teacherFinder());
-        return student2;
-    }
- 
+package com.baeldung.setterdi;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.setterdi.domain.Engine;
+import com.baeldung.setterdi.domain.Trailer;
+import com.baeldung.setterdi.domain.Transmission;
+
+@Configuration
+@ComponentScan("com.baeldung.setterdi")
+public class Config {
+
+    @Bean
+    public Engine engine() {
+        Engine engine = new Engine();
+        engine.setType("v8");
+        engine.setVolume(5);
+        return engine;
+    }
+
+    @Bean
+    public Transmission transmission() {
+        Transmission transmission = new Transmission();
+        transmission.setType("sliding");
+        return transmission;
+    }
+
+    @Bean
+    public Trailer trailer() {
+        Trailer trailer = new Trailer();
+        return trailer;
+    }
 }
\ No newline at end of file
diff --git a/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java b/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java
index 7ec477d2e2..57c1927e58 100644
--- a/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java
+++ b/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java
@@ -2,25 +2,13 @@ package com.baeldung.dependencyinjectiontypes;
 
 import static org.junit.Assert.assertTrue;
 
-import org.apache.log4j.Logger;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=com.baeldung.setterdi.Config.class, loader=AnnotationConfigContextLoader.class)
 public class DependencyInjectionTest {
-	
-	@Autowired
-	private ApplicationContext appContext;
-	
-	Logger logger = Logger.getLogger(this.getClass());
 
-   /* @Test
+    @Test
     public void givenAutowiredAnnotation_WhenSetOnSetter_ThenDependencyValid() {
         
     	ApplicationContext context = new ClassPathXmlApplicationContext("dependencyinjectiontypes-context.xml");
@@ -42,20 +30,6 @@ public class DependencyInjectionTest {
     	String formattedArticle = article.format(originalText);
     	
     	assertTrue(originalText.toUpperCase().equals(formattedArticle));
-    }*/
-    
-    @Test
-    public void givenAutowiredAnnotation_OnSetter_ThenDependencyValid() {
-    	Student student = (Student) appContext.getBean("student");
-    	String teacherFound = student.getTeacher();
-    	assertTrue(teacherFound.equals("author"));
-    }
-    
-    @Test
-    public void givenAutowiredAnnotation_OnConstructor_ThenDependencyValid() {
-    	Student2 student2 = (Student2) appContext.getBean("student2");
-    	String teacherFound = student2.getTeacher();
-    	assertTrue(teacherFound.equals("author"));
     }
     
 }