diff --git a/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index 41a0fc5d..f269eb2b 100644
--- a/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -22,32 +22,29 @@
 	<int:channel id="findPersonRequestChannel"/>
 	<int:channel id="findPersonReplyChannel"/>
 
-
 	<int:gateway id="personService" service-interface="org.springframework.integration.samples.jdbc.service.PersonService">
 		<int:method name="createPerson"
 					request-channel="createPersonRequestChannel"
 					request-timeout="5000"
 					reply-channel="createPersonReplyChannel"
-					reply-timeout="5000"/>
+					reply-timeout="0"/>
 		<int:method name="findPersonByName"
 					request-channel="findPersonRequestChannel"
 					request-timeout="5000"
 					reply-channel="findPersonReplyChannel"
-					reply-timeout="5000"/>
+					reply-timeout="0"/>
 	</int:gateway>
 
 	<int-jdbc:outbound-gateway data-source="datasource"
 		requires-reply="false"
-		update="UPDATE DUMMY SET DUMMY_VALUE='test'"
 		request-channel="findPersonRequestChannel"
 		query="select * from Person where lower(name)=lower(:payload)"
 		reply-channel="findPersonReplyChannel" row-mapper="personResultMapper"
-		max-rows-per-poll="100">
+		max-rows="100">
 	</int-jdbc:outbound-gateway>
 
-
-
 	<bean id="personResultMapper" class="org.springframework.integration.samples.jdbc.domain.PersonMapper"/>
+
 	<int-jdbc:outbound-gateway data-source="datasource"
 								request-channel="createPersonRequestChannel"
 								reply-channel="createPersonReplyChannel"
diff --git a/basic/jdbc/src/main/resources/setup-tables.sql b/basic/jdbc/src/main/resources/setup-tables.sql
index dee1726a..f837ec3f 100644
--- a/basic/jdbc/src/main/resources/setup-tables.sql
+++ b/basic/jdbc/src/main/resources/setup-tables.sql
@@ -1,6 +1,5 @@
 create table IF NOT EXISTS USERS(USERNAME varchar(100),PASSWORD varchar(100), EMAIL varchar(100));
-create table IF NOT EXISTS DUMMY(DUMMY_VALUE varchar(10));
 create table IF NOT EXISTS Person(id integer identity primary key , name varchar(100), gender varchar(1), dateOfBirth date);
 INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('a', 'secret', 'spring-integration@awesome.com');
 INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('b', 's3cr3t', 'spring@rocks.com');
-INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('foo', 'bar', 'foo@bar.de');
\ No newline at end of file
+INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('foo', 'bar', 'foo@bar.de');