diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
index a5bf9c1807..4efa8a63ac 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
@@ -456,31 +456,31 @@ namespace Umbraco.Core.Persistence.Repositories
             else
             {
                 columns.AddRange(new List<object>
-            {
-                "umbracoNode.id",
-                "umbracoNode.trashed",
-                "umbracoNode.parentID",
-                "umbracoNode.nodeUser",
-                "umbracoNode.level",
-                "umbracoNode.path",
-                "umbracoNode.sortOrder",
-                "umbracoNode.uniqueID",
-                "umbracoNode.text",
-                "umbracoNode.nodeObjectType",
-                "umbracoNode.createDate",
-                "COUNT(parent.parentID) as children"
-            };
-
-            if (isContent || isMedia)
-            {
-                if (isContent)
                 {
-                    //only content has/needs this info
-                    columns.Add("published.versionId as publishedVersion");
-                    columns.Add("document.versionId as newestVersion");
-                    columns.Add("contentversion.id as versionId");
-                }
-                
+                    "umbracoNode.id",
+                    "umbracoNode.trashed",
+                    "umbracoNode.parentID",
+                    "umbracoNode.nodeUser",
+                    "umbracoNode.level",
+                    "umbracoNode.path",
+                    "umbracoNode.sortOrder",
+                    "umbracoNode.uniqueID",
+                    "umbracoNode.text",
+                    "umbracoNode.nodeObjectType",
+                    "umbracoNode.createDate",
+                    "COUNT(parent.parentID) as children"
+                });
+
+                if (isContent || isMedia)
+                {
+                    if (isContent)
+                    {
+                        //only content has/needs this info
+                        columns.Add("published.versionId as publishedVersion");
+                        columns.Add("document.versionId as newestVersion");
+                        columns.Add("contentversion.id as versionId");
+                    }
+
                     columns.Add("contenttype.alias");
                     columns.Add("contenttype.icon");
                     columns.Add("contenttype.thumbnail");
@@ -508,10 +508,7 @@ namespace Umbraco.Core.Persistence.Repositories
                         .On("umbracoNode.id = published.nodeId");
                 }
 
-                entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");
-                }
-
-                entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");
+                entitySql.LeftJoin("cmsContentType contenttype").On("contenttype.nodeId = content.contentType");                
             }
 
             if (isCount == false)
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index a41a560161..4b5128e3de 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -553,7 +553,6 @@
     <Compile Include="Persistence\PocoDataDataReader.cs" />
     <Compile Include="Persistence\Querying\CachedExpression.cs" />
     <Compile Include="Persistence\Querying\QueryExtensions.cs" />
-    <Compile Include="Persistence\Querying\SqlExpressionExtensions.cs" />
     <Compile Include="Persistence\RecordPersistenceType.cs" />
     <Compile Include="Persistence\Relators\AccessRulesRelator.cs" />
     <Compile Include="Persistence\Repositories\AuditRepository.cs" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/EntityRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/EntityRepositoryTest.cs
index baf574e091..5993ccc62c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/EntityRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/EntityRepositoryTest.cs
@@ -33,13 +33,13 @@ namespace Umbraco.Tests.Persistence.Repositories
             base.TearDown();
         }
         
-        private ContentRepository CreateContentRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
+        private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
             TemplateRepository tr;
             return CreateContentRepository(unitOfWork, out contentTypeRepository, out tr);
         }
 
-        private ContentRepository CreateContentRepository(IDatabaseUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository)
+        private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository)
         {
             templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, SqlSyntax, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger, SqlSyntax);