diff --git a/src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs b/src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs
index dffa4766dc..233b5c2424 100644
--- a/src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs
+++ b/src/Umbraco.Abstractions/Models/Membership/MemberCountType.cs
@@ -6,7 +6,6 @@
     public enum MemberCountType
     {
         All,
-        Online,
         LockedOut,
         Approved
     }
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index fa45771e6f..8bba46ed63 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Security;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Scoping;
@@ -71,11 +68,7 @@ namespace Umbraco.Core.Services.Implement
                 {
                     case MemberCountType.All:
                         query = Query<IMember>();
-                        break;
-                    case MemberCountType.Online:
-                        var fromDate = DateTime.Now.AddMinutes(-Membership.UserIsOnlineTimeWindow);
-                        query = Query<IMember>().Where(x => ((Member) x).PropertyTypeAlias == Constants.Conventions.Member.LastLoginDate && ((Member) x).DateTimePropertyValue > fromDate);
-                        break;
+                        break;                    
                     case MemberCountType.LockedOut:
                         query = Query<IMember>().Where(x => ((Member) x).PropertyTypeAlias == Constants.Conventions.Member.IsLockedOut && ((Member) x).BoolPropertyValue);
                         break;
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index e78cf9bc3a..6569ef03e7 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data.Common;
-using System.Data.SqlClient;
-using System.Data.SqlServerCe;
 using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
@@ -12,12 +9,10 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Services.Implement
 {
@@ -479,23 +474,7 @@ namespace Umbraco.Core.Services.Implement
                 {
                     case MemberCountType.All:
                         query = Query<IUser>();
-                        break;
-                    case MemberCountType.Online:
-                        throw new NotImplementedException();
-                    //var fromDate = DateTime.Now.AddMinutes(-Membership.UserIsOnlineTimeWindow);
-                    //query =
-                    //    Query<IMember>.Builder.Where(
-                    //        x =>
-                    //        ((Member)x).PropertyTypeAlias == Constants.Conventions.Member.LastLoginDate &&
-                    //        ((Member)x).DateTimePropertyValue > fromDate);
-                    //return repository.GetCountByQuery(query);
-                    //var fromDate = DateTime.Now.AddMinutes(-Membership.UserIsOnlineTimeWindow);
-                    //query =
-                    //    Query<IMember>.Builder.Where(
-                    //        x =>
-                    //        ((Member)x).PropertyTypeAlias == Constants.Conventions.Member.LastLoginDate &&
-                    //        ((Member)x).DateTimePropertyValue > fromDate);
-                    //return repository.GetCountByQuery(query);
+                        break;                    
                     case MemberCountType.LockedOut:
                         query = Query<IUser>().Where(x => x.IsLockedOut);
                         break;
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index 7bcd3790d4..90a0a78def 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -1118,23 +1118,6 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(11, found);
         }
 
-        [Test]
-        public void Count_All_Online_Members()
-        {
-            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
-            ServiceContext.MemberTypeService.Save(memberType);
-            var members = MockedMember.CreateSimpleMember(memberType, 10, (i, member) => member.LastLoginDate = DateTime.Now.AddMinutes(i * -2));
-            ServiceContext.MemberService.Save(members);
-
-            var customMember = MockedMember.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue(Constants.Conventions.Member.LastLoginDate, DateTime.Now);
-            ServiceContext.MemberService.Save(customMember);
-
-            var found = ServiceContext.MemberService.GetCount(MemberCountType.Online);
-
-            Assert.AreEqual(9, found);
-        }
-
         [Test]
         public void Count_All_Locked_Members()
         {
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index 06b221288c..cb63c5a8cf 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -288,7 +288,7 @@ namespace Umbraco.Web.Security.Providers
         /// </remarks>
         public override int GetNumberOfUsersOnline()
         {
-            return MemberService.GetCount(MemberCountType.Online);
+            throw new NotImplementedException();
         }
 
         /// <summary>