diff --git a/App/StackExchange.DataExplorer/Controllers/QueryController.cs b/App/StackExchange.DataExplorer/Controllers/QueryController.cs
index 06e1ec06..247f1980 100644
--- a/App/StackExchange.DataExplorer/Controllers/QueryController.cs
+++ b/App/StackExchange.DataExplorer/Controllers/QueryController.cs
@@ -597,8 +597,7 @@ private void SetCommonQueryViewData(Site site, string header)
             Site = site;
             SetHeader(header);
             SelectMenuItem("Compose Query");
-            
-            ViewData["GuessedUserId"] = Site.GuessUserId(CurrentUser);
+
             ViewData["Tables"] = Site.GetTableInfos();
         }
     }
diff --git a/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs b/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs
index 24ca13a6..a65f8184 100644
--- a/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs
+++ b/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs
@@ -114,8 +114,6 @@ private ActionResult ShowCommon(Revision revision, string slug, bool latest)
             SetHeader(title);
             SelectMenuItem("Queries");
 
-            ViewData["GuessedUserId"] = Site.GuessUserId(CurrentUser);
-
             // Need to revamp voting process
             int totalVotes = Current.DB.Query<int>(@"
                 SELECT
diff --git a/App/StackExchange.DataExplorer/Models/Site.cs b/App/StackExchange.DataExplorer/Models/Site.cs
index df4743e8..c8fe81ee 100644
--- a/App/StackExchange.DataExplorer/Models/Site.cs
+++ b/App/StackExchange.DataExplorer/Models/Site.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data.SqlClient;
-using System.Web;
 using StackExchange.DataExplorer.Helpers;
 using Dapper;
 using System.Linq;
@@ -137,52 +136,6 @@ public void UpdateStats()
             Current.DB.Sites.Update(Id, new {TotalQuestions, TotalAnswers, TotalComments, LastPost, TotalUsers, TotalTags });
         }
 
-        public int? GuessUserId(User user)
-        {
-            if (user.IsAnonymous || !AppSettings.GuessUserId) return null;
-
-            string cacheKey = "UserIdForSite" + Id + "_" + user.Id;
-
-            var currentId = HttpContext.Current.Session[cacheKey] as int?;
-            if (currentId == null)
-            {
-                int? id = FindUserId(user);
-                if (id != null)
-                {
-                    HttpContext.Current.Cache[cacheKey] = id;
-                }
-            }
-
-            currentId = HttpContext.Current.Cache[cacheKey] as int?;
-            if (currentId == null)
-            {
-                HttpContext.Current.Cache[cacheKey] = -1;
-            }
-
-            return currentId != -1 ? currentId : null;
-        }
-
-        private int? FindUserId(User user)
-        {
-            if (!user.IsAnonymous && user.Email != null)
-            {
-                using (var cnn = GetOpenConnection())
-                {
-                    string hash = Util.GravatarHash(user.Email);
-                    try
-                    {
-                        return cnn.Query<int?>("select top 1 Id from Users where EmailHash = @hash order by Reputation desc", new {hash}).FirstOrDefault();
-                    }
-                    catch
-                    { 
-                        // allow this to fail, its not critical
-                    }
-                }
-            }
-            return null;
-        }
-
-
         /// <summary>
         /// Get the sites schema
         /// </summary>
diff --git a/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.Designer.cs b/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.Designer.cs
index b70403ba..efa0e48f 100644
--- a/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.Designer.cs
+++ b/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.Designer.cs
@@ -1411,30 +1411,6 @@ public static User CreateUser(global::System.Int32 id)
         partial void OnReputationChanging(Nullable<global::System.Int32> value);
         partial void OnReputationChanged();
     
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)]
-        [DataMemberAttribute()]
-        public global::System.String EmailHash
-        {
-            get
-            {
-                return _EmailHash;
-            }
-            set
-            {
-                OnEmailHashChanging(value);
-                ReportPropertyChanging("EmailHash");
-                _EmailHash = StructuralObject.SetValidValue(value, true, "EmailHash");
-                ReportPropertyChanged("EmailHash");
-                OnEmailHashChanged();
-            }
-        }
-        private global::System.String _EmailHash;
-        partial void OnEmailHashChanging(global::System.String value);
-        partial void OnEmailHashChanged();
-    
         /// <summary>
         /// No Metadata Documentation available.
         /// </summary>
diff --git a/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.edmx b/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.edmx
index 8c710e4d..7fc75195 100644
--- a/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.edmx
+++ b/App/StackExchange.DataExplorer/Models/StackEntities/StackExchangeData.edmx
@@ -71,7 +71,6 @@
           </Key>
           <Property Name="Id" Type="int" Nullable="false" />
           <Property Name="Reputation" Type="int" />
-          <Property Name="EmailHash" Type="varchar" MaxLength="40" />
           <Property Name="CreationDate" Type="datetime" />
           <Property Name="DisplayName" Type="nvarchar" MaxLength="40" />
           <Property Name="LastAccessDate" Type="datetime" />
@@ -205,7 +204,6 @@
           </Key>
           <Property Name="Id" Type="Int32" Nullable="false" />
           <Property Name="Reputation" Type="Int32" />
-          <Property Name="EmailHash" Type="String" MaxLength="40" Unicode="false" FixedLength="false" />
           <Property Name="CreationDate" Type="DateTime" />
           <Property Name="DisplayName" Type="String" MaxLength="40" Unicode="true" FixedLength="false" />
           <Property Name="LastAccessDate" Type="DateTime" />
@@ -341,7 +339,6 @@
           <EntitySetMapping Name="Users"><EntityTypeMapping TypeName="MetaModel.User"><MappingFragment StoreEntitySet="Users">
             <ScalarProperty Name="Id" ColumnName="Id" />
             <ScalarProperty Name="Reputation" ColumnName="Reputation" />
-            <ScalarProperty Name="EmailHash" ColumnName="EmailHash" />
             <ScalarProperty Name="CreationDate" ColumnName="CreationDate" />
             <ScalarProperty Name="DisplayName" ColumnName="DisplayName" />
             <ScalarProperty Name="LastAccessDate" ColumnName="LastAccessDate" />
diff --git a/App/StackExchange.DataExplorer/StackExchange.DataExplorer.csproj b/App/StackExchange.DataExplorer/StackExchange.DataExplorer.csproj
index b997d0c4..d26a0c9b 100644
--- a/App/StackExchange.DataExplorer/StackExchange.DataExplorer.csproj
+++ b/App/StackExchange.DataExplorer/StackExchange.DataExplorer.csproj
@@ -475,7 +475,6 @@
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\PageNotFound.cshtml" />
     <Content Include="Views\Shared\AboutSite.cshtml" />
-    <Content Include="Views\Shared\GuessedUserId.cshtml" />
     <Content Include="Views\Shared\Menu.cshtml" />
     <Content Include="Views\Shared\PageSizer.cshtml" />
     <Content Include="Views\Shared\QueryVoting.cshtml" />
diff --git a/App/StackExchange.DataExplorer/Views/Shared/GuessedUserId.cshtml b/App/StackExchange.DataExplorer/Views/Shared/GuessedUserId.cshtml
deleted file mode 100644
index ffc24efe..00000000
--- a/App/StackExchange.DataExplorer/Views/Shared/GuessedUserId.cshtml
+++ /dev/null
@@ -1,10 +0,0 @@
-@{
-    if (ViewData["GuessedUserId"] != null)
-    {
-        <text>var guessedUserId = @ViewData["GuessedUserId"];</text>
-    }
-    else
-    {
-        <text>var guessedUserId = "";</text>
-    }
-}
diff --git a/App/StackExchange.DataExplorer/Views/Shared/Master.cshtml b/App/StackExchange.DataExplorer/Views/Shared/Master.cshtml
index a9360ff9..6394c4b4 100644
--- a/App/StackExchange.DataExplorer/Views/Shared/Master.cshtml
+++ b/App/StackExchange.DataExplorer/Views/Shared/Master.cshtml
@@ -20,7 +20,7 @@
     <script>
         DataExplorer.init({
             'User.id': @(Current.User.IsAnonymous ? "null" : Current.User.Id.ToString()),
-            'User.guessedID': @(ViewData["GuessedUserId"] ?? "null"),
+            'User.guessedID': null,
             'User.hideSchema': @Current.User.HideSchema.ToString().ToLower(),
             'User.isAuthenticated': @((!Current.User.IsAnonymous).ToString().ToLower()),
             'Site.id': @(Current.Controller.Site != null ? Current.Controller.Site.Id.ToString() : "null"),