diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java
index bd70585bb..e5d35ddb9 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java
@@ -16,6 +16,7 @@
 
 package org.springframework.batch.core;
 
+import java.io.ObjectStreamException;
 import java.io.Serializable;
 
 /**
@@ -39,7 +40,7 @@ public class BatchStatus implements Serializable {
 		this.name = name;
 	}
 
-	private Object readResolve() throws java.io.ObjectStreamException {
+	private Object readResolve() throws ObjectStreamException {
 		return getStatus(name);
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java
index a253cd557..b38d27975 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java
@@ -17,8 +17,6 @@ package org.springframework.batch.core;
 
 import java.util.List;
 
-import org.springframework.batch.io.exception.InfrastructureException;
-
 /**
  * Batch domain object representing a job. Job is an explicit abstraction
  * representing the configuration of a job specified by a developer. It should
@@ -41,8 +39,8 @@ public interface Job {
 	 * and statistics as necessary.
 	 * 
 	 * @param execution a {@link JobExecution}
-	 * @throws InfrastructureException
+	 * @throws JobExecutionException
 	 */
-	void execute(JobExecution execution) throws InfrastructureException;
+	void execute(JobExecution execution) throws JobExecutionException;
 
 }
\ No newline at end of file
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
index 106ea8e6a..6254638c4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
@@ -15,13 +15,9 @@
  */
 package org.springframework.batch.core;
 
-import org.springframework.batch.io.exception.InfrastructureException;
-
 /**
- * Batch domain interface representing the configuration of a step. As with the
- * (@link Job), a {@link Step} is meant to explicitly represent a the
- * configuration of a step by a developer, but also the ability to execute the
- * step.
+ * Batch domain interface representing the configuration of a step. As with the (@link Job), a {@link Step} is meant to
+ * explicitly represent a the configuration of a step by a developer, but also the ability to execute the step.
  * 
  * @author Dave Syer
  * 
@@ -34,32 +30,26 @@ public interface Step {
 	String getName();
 
 	/**
-	 * @return true if a step that is already marked as complete can be started
-	 * again.
+	 * @return true if a step that is already marked as complete can be started again.
 	 */
 	boolean isAllowStartIfComplete();
 
 	/**
-	 * @return the number of times a job can be started with the same
-	 * identifier.
+	 * @return the number of times a job can be started with the same identifier.
 	 */
 	int getStartLimit();
 
 	/**
-	 * Process the step and assign progress and status meta information to the
-	 * {@link StepExecution} provided. The {@link Step} is responsible for
-	 * setting the meta information and also saving it if required by the
+	 * Process the step and assign progress and status meta information to the {@link StepExecution} provided. The
+	 * {@link Step} is responsible for setting the meta information and also saving it if required by the
 	 * implementation.<br/>
 	 * 
-	 * It is not safe to re-use an instance of {@link Step} to process multiple
-	 * concurrent executions.
+	 * It is not safe to re-use an instance of {@link Step} to process multiple concurrent executions.
 	 * 
 	 * @param stepExecution an entity representing the step to be executed
 	 * 
 	 * @throws JobInterruptedException if the step is interrupted externally
-	 * @throws InfrastructureException if there is a problem that needs to be
-	 * signalled to the caller
 	 */
-	void execute(StepExecution stepExecution) throws JobInterruptedException, InfrastructureException;
+	void execute(StepExecution stepExecution) throws JobInterruptedException;
 
 }
\ No newline at end of file