diff --git a/spring-rest/src/main/java/org/baeldung/config/WebConfig.java b/spring-rest/src/main/java/org/baeldung/config/WebConfig.java
index 3661b2c561..f42c3cb283 100644
--- a/spring-rest/src/main/java/org/baeldung/config/WebConfig.java
+++ b/spring-rest/src/main/java/org/baeldung/config/WebConfig.java
@@ -1,15 +1,7 @@
 package org.baeldung.config;
 
-import java.text.SimpleDateFormat;
-import java.util.List;
-
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.http.converter.xml.MarshallingHttpMessageConverter;
-import org.springframework.oxm.xstream.XStreamMarshaller;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
@@ -26,30 +18,30 @@ public class WebConfig extends WebMvcConfigurerAdapter {
     }
 
     //
+    /*
+        @Override
+        public void configureMessageConverters(final List<HttpMessageConverter<?>> messageConverters) {
+            final Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
+            builder.indentOutput(true)
+                .dateFormat(new SimpleDateFormat("dd-MM-yyyy hh:mm"));
+            messageConverters.add(new MappingJackson2HttpMessageConverter(builder.build()));
+            // messageConverters.add(new MappingJackson2XmlHttpMessageConverter(builder.createXmlMapper(true).build()));
 
-    @Override
-    public void configureMessageConverters(final List<HttpMessageConverter<?>> messageConverters) {
-        final Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
-        builder.indentOutput(true)
-            .dateFormat(new SimpleDateFormat("dd-MM-yyyy hh:mm"));
-        messageConverters.add(new MappingJackson2HttpMessageConverter(builder.build()));
-        // messageConverters.add(new MappingJackson2XmlHttpMessageConverter(builder.createXmlMapper(true).build()));
+            // messageConverters.add(createXmlHttpMessageConverter());
+            // messageConverters.add(new MappingJackson2HttpMessageConverter());
 
-        // messageConverters.add(createXmlHttpMessageConverter());
-        // messageConverters.add(new MappingJackson2HttpMessageConverter());
+            // messageConverters.add(new ProtobufHttpMessageConverter());
+            super.configureMessageConverters(messageConverters);
+        }
 
-        // messageConverters.add(new ProtobufHttpMessageConverter());
-        super.configureMessageConverters(messageConverters);
-    }
+        private HttpMessageConverter<Object> createXmlHttpMessageConverter() {
+            final MarshallingHttpMessageConverter xmlConverter = new MarshallingHttpMessageConverter();
 
-    private HttpMessageConverter<Object> createXmlHttpMessageConverter() {
-        final MarshallingHttpMessageConverter xmlConverter = new MarshallingHttpMessageConverter();
-
-        final XStreamMarshaller xstreamMarshaller = new XStreamMarshaller();
-        xmlConverter.setMarshaller(xstreamMarshaller);
-        xmlConverter.setUnmarshaller(xstreamMarshaller);
-
-        return xmlConverter;
-    }
+            final XStreamMarshaller xstreamMarshaller = new XStreamMarshaller();
+            xmlConverter.setMarshaller(xstreamMarshaller);
+            xmlConverter.setUnmarshaller(xstreamMarshaller);
 
+            return xmlConverter;
+        }
+    */
 }
diff --git a/spring-rest/src/main/java/org/baeldung/web/controller/MyFooController.java b/spring-rest/src/main/java/org/baeldung/web/controller/MyFooController.java
index 061213a3e9..251e0b23e7 100644
--- a/spring-rest/src/main/java/org/baeldung/web/controller/MyFooController.java
+++ b/spring-rest/src/main/java/org/baeldung/web/controller/MyFooController.java
@@ -32,7 +32,7 @@ public class MyFooController {
 
     // API - read
 
-    @RequestMapping(method = RequestMethod.GET)
+    @RequestMapping(method = RequestMethod.GET, produces = { "application/json" })
     @ResponseBody
     public Collection<Foo> findAll() {
         return myfoos.values();
diff --git a/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
index d133bcea22..7e7d820836 100644
--- a/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
+++ b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
@@ -19,12 +19,11 @@
 		    </bean> 
             -->     
            <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
-<!--            <bean class="org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter"/>         
- -->        </mvc:message-converters>
+<!-- <bean class="org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter"/>         -->      
+  </mvc:message-converters>
     </mvc:annotation-driven>
     
     <bean id="xstreamMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller" />
-    
     <!--  -->
 
     <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
diff --git a/spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java b/spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
index 2d12262e85..7bcaab6a07 100644
--- a/spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
+++ b/spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
@@ -42,7 +42,7 @@ public class RestTemplateBasicLiveTest {
     @Before
     public void beforeTest() {
         restTemplate = new RestTemplate();
-        restTemplate.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter()));
+        // restTemplate.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter()));
     }
 
     // GET
@@ -78,7 +78,6 @@ public class RestTemplateBasicLiveTest {
     @Test
     public void givenFooService_whenCallHeadForHeaders_thenReceiveAllHeadersForThatResource() {
         final HttpHeaders httpHeaders = restTemplate.headForHeaders(fooResourceUrl);
-
         assertTrue(httpHeaders.getContentType()
             .includes(MediaType.APPLICATION_JSON));
     }
@@ -248,4 +247,5 @@ public class RestTemplateBasicLiveTest {
         clientHttpRequestFactory.setConnectTimeout(timeout * 1000);
         return clientHttpRequestFactory;
     }
+
 }