diff --git a/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs b/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs
index 98ab898cd4..49bcbd4262 100644
--- a/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/TaskFactory.cs
@@ -6,9 +6,9 @@ namespace Umbraco.Core.Persistence.Factories
     /// <summary>
     /// Creates the model mappings for Tasks
     /// </summary>
-    internal class TaskFactory
+    internal static class TaskFactory
     {
-        public Task BuildEntity(TaskDto dto)
+        public static Task BuildEntity(TaskDto dto)
         {
             var entity = new Task(new TaskType(dto.TaskTypeDto.Alias) { Id = dto.TaskTypeDto.Id });
 
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Persistence.Factories
             }
         }
 
-        public TaskDto BuildDto(Task entity)
+        public static TaskDto BuildDto(Task entity)
         {
             var dto = new TaskDto
             {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
index f33a1c852a..656c97a1e9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
@@ -29,9 +29,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var taskDto = Database.Fetch<TaskDto>(SqlContext.SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
             if (taskDto == null)
                 return null;
-
-            var factory = new TaskFactory();
-            var entity = factory.BuildEntity(taskDto);
+            
+            var entity = TaskFactory.BuildEntity(taskDto);
             return entity;
         }
 
@@ -43,10 +42,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             {
                 sql.Where("cmsTask.id IN (@ids)", new { ids = ids });
             }
-
-            var factory = new TaskFactory();
+            
             var dtos = Database.Fetch<TaskDto>(sql);
-            return dtos.Select(factory.BuildEntity);
+            return dtos.Select(TaskFactory.BuildEntity);
         }
 
         protected override IEnumerable<Task> PerformGetByQuery(IQuery<Task> query)
@@ -55,9 +53,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var translator = new SqlTranslator<Task>(sqlClause, query);
             var sql = translator.Translate();
 
-            var factory = new TaskFactory();
             var dtos = Database.Fetch<TaskDto>(sql);
-            return dtos.Select(factory.BuildEntity);
+            return dtos.Select(TaskFactory.BuildEntity);
         }
 
         protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
@@ -107,9 +104,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             {
                 entity.TaskType.Id = taskType.Id;
             }
-
-            var factory = new TaskFactory();
-            var dto = factory.BuildDto(entity);
+            
+            var dto = TaskFactory.BuildDto(entity);
 
             var id = Convert.ToInt32(Database.Insert(dto));
             entity.Id = id;
@@ -120,9 +116,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistUpdatedItem(Task entity)
         {
             entity.UpdatingEntity();
-
-            var factory = new TaskFactory();
-            var dto = factory.BuildDto(entity);
+            
+            var dto = TaskFactory.BuildDto(entity);
 
             Database.Update(dto);
 
@@ -138,8 +133,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
 
             var dtos = Database.Fetch<TaskDto>(sql);
-            var factory = new TaskFactory();
-            return dtos.Select(factory.BuildEntity);
+     
+            return dtos.Select(TaskFactory.BuildEntity);
         }
 
         private Sql<ISqlContext> GetGetTasksQuery(int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false)