diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java
index 266b2cf3..4a9bf169 100644
--- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java
+++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java
@@ -21,7 +21,6 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.cloud.task.batch.listener.TaskBatchDao;
 import org.springframework.cloud.task.configuration.TaskProperties;
 import org.springframework.cloud.task.repository.TaskExecution;
-import org.springframework.cloud.task.repository.dao.JdbcTaskExecutionDao;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.Assert;
@@ -75,6 +74,7 @@ public class JdbcTaskBatchDao implements TaskBatchDao {
 	 * The table prefix for the task batch table.
 	 *
 	 * @param tablePrefix defaults to {@link TaskProperties#DEFAULT_TABLE_PREFIX}.
+	 * @deprecated Use the constructor to inject this value
 	 */
 	@Deprecated
  	public void setTablePrefix(String tablePrefix) {
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java
index d94b168d..75f61ba7 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java
@@ -61,6 +61,7 @@ public class DefaultTaskConfigurer implements TaskConfigurer {
 	/**
 	 * Initializes the DefaultTaskConfigurer and sets the default table prefix
 	 * to {@link TaskProperties#DEFAULT_TABLE_PREFIX}.
+	 *
 	 * @param dataSource references the {@link DataSource} to be used as the Task
 	 * repository.  If none is provided, a Map will be used (not recommended for
 	 * production use.
@@ -69,7 +70,9 @@ public class DefaultTaskConfigurer implements TaskConfigurer {
 		this(dataSource, TaskProperties.DEFAULT_TABLE_PREFIX);
 	}
 
-	/** Initializes the DefaultTaskConfigurer.
+	/**
+	 * Initializes the DefaultTaskConfigurer.
+	 *
 	 * @param tablePrefix the prefix to apply to the task table names used by
 	 * task infrastructure.
 	 */
@@ -77,7 +80,9 @@ public class DefaultTaskConfigurer implements TaskConfigurer {
 		this(null, tablePrefix);
 	}
 
-	/** Initializes the DefaultTaskConfigurer.
+	/**
+	 * Initializes the DefaultTaskConfigurer.
+	 *
 	 * @param dataSource references the {@link DataSource} to be used as the Task
 	 * repository.  If none is provided, a Map will be used (not recommended for
 	 * production use.
diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java
index c830eb9b..66c7f9dc 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java
@@ -20,7 +20,6 @@ import javax.sql.DataSource;
 import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
 import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.cloud.task.configuration.TaskConfigurer;
 import org.springframework.cloud.task.configuration.TaskProperties;
 import org.springframework.cloud.task.repository.dao.JdbcTaskExecutionDao;
 import org.springframework.cloud.task.repository.dao.MapTaskExecutionDao;
@@ -102,6 +101,7 @@ public class TaskExecutionDaoFactoryBean implements FactoryBean<TaskExecutionDao
 	 * used.
 	 *
 	 * @param tablePrefix the string prefix for the task table names
+	 * @deprecated Use the constructor to inject
 	 */
 	@Deprecated
 	public void setTablePrefix(String tablePrefix) {
diff --git a/spring-cloud-task-docs/src/main/asciidoc/features.adoc b/spring-cloud-task-docs/src/main/asciidoc/features.adoc
index da37749d..22abcd47 100644
--- a/spring-cloud-task-docs/src/main/asciidoc/features.adoc
+++ b/spring-cloud-task-docs/src/main/asciidoc/features.adoc
@@ -153,11 +153,10 @@ that is required.
 [[features-table-initialization]]
 === Enable/Disable table initialization
 In cases where you are creating the task tables and do not wish for
-Spring Cloud Task to create them (if not present) at task startup set the
+Spring Cloud Task to create them at task startup set the
 `spring.cloud.task.initialize.enable` property to `false`.  It is currently
 defaulted to `true`.
 
-
 ```
  spring.cloud.task.initialize.enable=<true or false>
 ```