diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java
index 721d352c..99d97e5e 100644
--- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java
+++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.integration.samples.tcpclientserver;
 
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/basic/tcp-client-server/src/test/resources/log4j.xml b/basic/tcp-client-server/src/test/resources/log4j.xml
deleted file mode 100644
index f391e2ed..00000000
--- a/basic/tcp-client-server/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Loggers -->
-	<logger name="org.springframework">
-		<level value="warn" />
-	</logger>
-
-	<logger name="org.springframework.integration.samples">
-		<level value="debug" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="warn" />
-		<appender-ref ref="console" />
-	</root>
-	
-</log4j:configuration>
\ No newline at end of file
diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java
index 9e41426c..a6ef52f2 100644
--- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java
+++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java
@@ -57,7 +57,6 @@ public class TrafficHttpConverter implements HttpMessageConverter<Traffic> {
 		return supportedMediaTypes;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public Traffic read(Class<? extends Traffic> clazz, HttpInputMessage inputMessage) throws IOException,
 																	HttpMessageNotReadableException {