diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java
index ef70ed6ee..8071312e4 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java
@@ -71,7 +71,6 @@ public class NonAbstractStepTests {
 	 * Fills the events list when listener methods are called, prefixed with the
 	 * name of the listener.
 	 */
-	@SuppressWarnings("unused")
 	private class EventTrackingListener implements StepExecutionListener {
 
 		private String name;
@@ -91,13 +90,6 @@ public class NonAbstractStepTests {
 			return stepExecution.getExitStatus();
 		}
 
-		public ExitStatus onErrorInStep(StepExecution stepExecution, Throwable e) {
-			assertSame(execution, stepExecution);
-			events.add(getEvent("onErrorInStep"));
-			stepExecution.getExecutionContext().putString("onErrorInStep", "onErrorInStep");
-			return stepExecution.getExitStatus();
-		}
-
 		public void beforeStep(StepExecution stepExecution) {
 			assertSame(execution, stepExecution);
 			events.add(getEvent("beforeStep"));
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
index de46ddc30..f40b7c1be 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
@@ -122,23 +122,10 @@ public class StagingItemReader<T> implements ItemReader<ProcessIndicatorItemWrap
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.batch.core.domain.StepListener#afterStep(StepExecution
-	 * )
-	 */
 	public ExitStatus afterStep(StepExecution stepExecution) {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.springframework.batch.core.domain.StepListener#beforeStep(org.
-	 * springframework.batch.core.domain.StepExecution)
-	 */
 	public void beforeStep(StepExecution stepExecution) {
 		this.stepExecution = stepExecution;
 		synchronized (lock) {
@@ -150,15 +137,4 @@ public class StagingItemReader<T> implements ItemReader<ProcessIndicatorItemWrap
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.batch.core.domain.StepListener#onErrorInStep(java
-	 * .lang.Throwable)
-	 */
-	public ExitStatus onErrorInStep(StepExecution stepExecution, Throwable e) {
-		return null;
-	}
-
 }
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java
index c2b02fe44..a9444f610 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java
@@ -123,15 +123,4 @@ public class StagingItemWriter<T> extends JdbcDaoSupport implements StepExecutio
 		this.stepExecution = stepExecution;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.batch.core.domain.StepListener#onErrorInStep(java
-	 * .lang.Throwable)
-	 */
-	public ExitStatus onErrorInStep(StepExecution stepExecution, Throwable e) {
-		return null;
-	}
-
 }