diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
index 5185e5387a..4d09b32a28 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
@@ -26,8 +26,6 @@ using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Mail;
 using Umbraco.Cms.Core.Manifest;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.PropertyEditors;
diff --git a/src/Umbraco.Core/Services/UserDataService.cs b/src/Umbraco.Core/Services/UserDataService.cs
index b76d9e3ae3..c76b70e19b 100644
--- a/src/Umbraco.Core/Services/UserDataService.cs
+++ b/src/Umbraco.Core/Services/UserDataService.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Cms.Core.Services
 {
     public class UserDataService : IUserDataService
     {
-        private IUmbracoVersion _version;
+        private readonly IUmbracoVersion _version;
         private readonly ILocalizationService _localizationService;
         public UserDataService(IUmbracoVersion version, ILocalizationService localizationService)
         {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
index 23db68513e..602b972a65 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
@@ -17,11 +17,8 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services
         private IUmbracoVersion _umbracoVersion;
         private ILocalizationService _localizationService;
 
-        [SetUp]
-        public void CreateMocks()
-        {
-            CreateUmbracoVersion(9, 0, 0);
-        }
+        [OneTimeSetUp]
+        public void CreateMocks() => CreateUmbracoVersion(9, 0, 0);
 
         [Test]
         [TestCase("en-US")]
diff --git a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
index b1ade72b0e..6a83613017 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
@@ -163,6 +163,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
             var userTours = JsonConvert.DeserializeObject<IEnumerable<UserTourStatus>>(_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.TourData);
             return userTours;
         }
+
         public IEnumerable<UserData> GetUserData()
         {
             return _userDataService.GetUserData();