diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
index 0f2a1f1b8..c97915bd0 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
@@ -93,9 +93,9 @@ public class JobFlowExecutor implements FlowExecutor {
 		if (getStepExecution() != null && getStepExecution().getStatus() == BatchStatus.ABANDONED) {
 			/*
 			 * This is assumed to be the last step execution and it was marked
-			 * abandoned, so we are in a restart of a stopped step. TODO: mark
-			 * the step execution in some more definitive way?
+			 * abandoned, so we are in a restart of a stopped step. 
 			 */
+			// TODO: mark the step execution in some more definitive way?
 			return true;
 		}
 		return execution.getStepExecutions().isEmpty();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactoryTests.java
index 7e7042d20..c5ba04c75 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactoryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactoryTests.java
@@ -30,6 +30,7 @@ import org.springframework.util.ClassUtils;
  * @author Dave Syer
  *
  */
+@SuppressWarnings("deprecation")
 public class OsgiBundleXmlApplicationContextFactoryTests {
 	
 	private OsgiBundleXmlApplicationContextFactory factory = new OsgiBundleXmlApplicationContextFactory();
@@ -46,7 +47,6 @@ public class OsgiBundleXmlApplicationContextFactoryTests {
 		expect(bundleContext.getBundle()).andReturn(bundle).anyTimes();
 		replay(bundleContext, bundle);
 		factory.setBundleContext(bundleContext);
-		// TODO: mock out the OSGi bundle resource...
 		// factory.createApplicationContext();
 		verify(bundleContext, bundle);
 	}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java
index b9c6e0045..e3c958430 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java
@@ -11,23 +11,18 @@ import org.springframework.batch.repeat.RepeatStatus;
 public class DummyCompletionPolicy implements CompletionPolicy {
 
 	public boolean isComplete(RepeatContext context, RepeatStatus result) {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	public boolean isComplete(RepeatContext context) {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	public RepeatContext start(RepeatContext parent) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
-	public void update(RepeatContext context) {
-		// TODO Auto-generated method stub
-		
+	public void update(RepeatContext context) 
 	}
 
 }
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java
index 917d8b095..084301171 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java
@@ -47,8 +47,6 @@ public class FlowStepTests {
 	private JobRepository jobRepository;
 	private JobExecution jobExecution;
 
-	// TODO: add XML support
-
 	@Before
 	public void setUp() throws Exception {
 		jobRepository = new MapJobRepositoryFactoryBean().getJobRepository();
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java
index d1d816e95..2e4929dac 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java
@@ -256,7 +256,7 @@ public class FaultTolerantExceptionClassesTests implements ApplicationContextAwa
 		assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
 		// BATCH-1332:
 		assertEquals("[1, 2, 3, 1, 2, 3, 4]", writer.getWritten().toString());
-		// TODO BATCH-1334:
+		// BATCH-1334:
 		// Skipped but also committed (because it was marked as no-rollback)
 		assertEquals("[1, 2, 3, 4]", writer.getCommitted().toString());
 		assertEquals(1, stepExecution.getWriteSkipCount());
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
index d08268122..41e5d7559 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
@@ -20,7 +20,7 @@ public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase {
 	protected Resource resource = new ClassPathResource("org/springframework/batch/io/oxm/input.xml");
 
 	protected void setUp() throws Exception {
-		// TODO sensible resource allocation
+
 		source.setResource(resource);
 
 		source.setFragmentRootElementName("trade");
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
index f4e365bc6..93925747d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
@@ -101,7 +101,6 @@ public class StaxEventItemReader<T> extends AbstractItemCountingItemStreamItemRe
 
 	/**
 	 * @param fragmentRootElementName name of the root element of the fragment
-	 * TODO String can be ambiguous due to namespaces, use QName?
 	 */
 	public void setFragmentRootElementName(String fragmentRootElementName) {
 		this.fragmentRootElementName = fragmentRootElementName;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
index 3b6fc59bd..299d6df85 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
@@ -263,7 +263,6 @@ public class RepeatTemplate implements RepeatOperations {
 					}
 				}
 				finally {
-					// TODO: extend this to the completion policy?
 					context.close();
 				}