diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index f7c954084..c6ae57c3e 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -148,15 +148,6 @@
 				<config>src/main/resources/jobs/footballJob.xml</config>
 			</configs>
 		</configSet>
-		<configSet>
-			<name><![CDATA[simpleTasklet]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
 		<configSet>
 			<name><![CDATA[hibernate]]></name>
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
@@ -247,5 +238,15 @@
 				<config>src/main/resources/data-source-context-init.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[simpleJob]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/jobs/simpleJob.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java
index 09733e5d7..7481c454c 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java
@@ -17,9 +17,7 @@
 package org.springframework.batch.sample.tasklet;
 
 import org.springframework.batch.core.tasklet.Tasklet;
-import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.repeat.ExitStatus;
-import org.springframework.batch.support.PropertiesConverter;
 
 /**
  * Simple module implementation that will always return true to indicate that
diff --git a/spring-batch-samples/src/main/resources/jobs/simpleJob.xml b/spring-batch-samples/src/main/resources/jobs/simpleJob.xml
index 5690b4b09..980853f37 100644
--- a/spring-batch-samples/src/main/resources/jobs/simpleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/simpleJob.xml
@@ -10,7 +10,7 @@
 	<bean parent="stepScope"/>
 	<bean parent="jobConfigurationRegistryBeanPostProcessor"/>
 
-	<bean id="simpleJob" parent="simpleJob">
+	<bean id="simpleSample" parent="simpleJob">
 		<property name="steps">
 			<list>
 				<bean id="step1" parent="simpleStep">