diff --git a/src/Api/Controllers/FoldersController.cs b/src/Api/Controllers/FoldersController.cs
index 2e9ef578df..934ecc0643 100644
--- a/src/Api/Controllers/FoldersController.cs
+++ b/src/Api/Controllers/FoldersController.cs
@@ -36,7 +36,7 @@ namespace Bit.Api.Controllers
         }
 
         [HttpGet("")]
-        public async Task<ListResponseModel<FolderResponseModel>> Get(bool dirty = false)
+        public async Task<ListResponseModel<FolderResponseModel>> Get()
         {
             var folders = await _folderRepository.GetManyByUserIdAsync(User.GetUserId());
             return new ListResponseModel<FolderResponseModel>(folders.Select(f => new FolderResponseModel(f)));
diff --git a/src/Api/Controllers/SitesController.cs b/src/Api/Controllers/SitesController.cs
index d3441d77ca..746cb58c9f 100644
--- a/src/Api/Controllers/SitesController.cs
+++ b/src/Api/Controllers/SitesController.cs
@@ -42,9 +42,9 @@ namespace Bit.Api.Controllers
         }
 
         [HttpGet("")]
-        public async Task<ListResponseModel<SiteResponseModel>> Get(bool dirty = false, string[] expand = null)
+        public async Task<ListResponseModel<SiteResponseModel>> Get(string[] expand = null)
         {
-            var sites = await _siteRepository.GetManyByUserIdAsync(User.GetUserId(), dirty);
+            var sites = await _siteRepository.GetManyByUserIdAsync(User.GetUserId());
 
             var responses = sites.Select(s => new SiteResponseModel(s)).ToList();
             await ExpandManyAsync(sites, responses, expand, null);
diff --git a/src/Core/Identity/JwtBearerBuilderExtensions.cs b/src/Core/Identity/JwtBearerBuilderExtensions.cs
index bd66ce15c1..acca33944e 100644
--- a/src/Core/Identity/JwtBearerBuilderExtensions.cs
+++ b/src/Core/Identity/JwtBearerBuilderExtensions.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.OptionsModel;
-using Bit.Core.Domains;
 using Microsoft.AspNet.Authentication.JwtBearer;
 
 namespace Bit.Core.Identity
diff --git a/src/Core/Repositories/IFolderRepository.cs b/src/Core/Repositories/IFolderRepository.cs
index 916f370ac2..18fff16219 100644
--- a/src/Core/Repositories/IFolderRepository.cs
+++ b/src/Core/Repositories/IFolderRepository.cs
@@ -8,6 +8,5 @@ namespace Bit.Core.Repositories
     {
         Task<Folder> GetByIdAsync(string id, string userId);
         Task<ICollection<Folder>> GetManyByUserIdAsync(string userId);
-        Task<ICollection<Folder>> GetManyByUserIdAsync(string userId, bool dirty);
     }
 }
diff --git a/src/Core/Repositories/ISiteRepository.cs b/src/Core/Repositories/ISiteRepository.cs
index 9e734a24f0..f9aeeba8ab 100644
--- a/src/Core/Repositories/ISiteRepository.cs
+++ b/src/Core/Repositories/ISiteRepository.cs
@@ -9,6 +9,5 @@ namespace Bit.Core.Repositories
     {
         Task<Site> GetByIdAsync(string id, string userId);
         Task<ICollection<Site>> GetManyByUserIdAsync(string userId);
-        Task<ICollection<Site>> GetManyByUserIdAsync(string userId, bool dirty);
     }
 }
diff --git a/src/Core/Repositories/SqlServer/FolderRepository.cs b/src/Core/Repositories/SqlServer/FolderRepository.cs
index 61e6cf2ae0..fb1b9b9083 100644
--- a/src/Core/Repositories/SqlServer/FolderRepository.cs
+++ b/src/Core/Repositories/SqlServer/FolderRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
@@ -32,16 +33,11 @@ namespace Bit.Core.Repositories.SqlServer
             {
                 var results = await connection.QueryAsync<FolderTableModel>(
                     $"[{Schema}].[{Table}_ReadByUserId]",
-                    new { UserId = userId },
+                    new { UserId = new Guid(userId) },
                     commandType: CommandType.StoredProcedure);
 
                 return results.Select(f => f.ToDomain()).ToList();
             }
         }
-
-        public async Task<ICollection<Folder>> GetManyByUserIdAsync(string userId, bool dirty)
-        {
-            return await GetManyByUserIdAsync(userId);
-        }
     }
 }
diff --git a/src/Core/Repositories/SqlServer/Repository.cs b/src/Core/Repositories/SqlServer/Repository.cs
index e3e2c06300..0594ab4ced 100644
--- a/src/Core/Repositories/SqlServer/Repository.cs
+++ b/src/Core/Repositories/SqlServer/Repository.cs
@@ -33,7 +33,7 @@ namespace Bit.Core.Repositories.SqlServer
             {
                 var results = await connection.QueryAsync<TModel>(
                     $"[{Schema}].[{Table}_ReadById]",
-                    new { Id = id },
+                    new { Id = new Guid(id) },
                     commandType: CommandType.StoredProcedure);
 
                 var model = results.FirstOrDefault();
@@ -96,7 +96,7 @@ namespace Bit.Core.Repositories.SqlServer
             {
                 await connection.ExecuteAsync(
                     $"[{Schema}].[{Table}_DeleteById]",
-                    new { Id = id },
+                    new { Id = new Guid(id) },
                     commandType: CommandType.StoredProcedure);
             }
         }
diff --git a/src/Core/Repositories/SqlServer/SiteRepository.cs b/src/Core/Repositories/SqlServer/SiteRepository.cs
index 19d616065d..8ec07ba453 100644
--- a/src/Core/Repositories/SqlServer/SiteRepository.cs
+++ b/src/Core/Repositories/SqlServer/SiteRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
@@ -32,16 +33,11 @@ namespace Bit.Core.Repositories.SqlServer
             {
                 var results = await connection.QueryAsync<SiteTableModel>(
                     $"[{Schema}].[{Table}_ReadByUserId]",
-                    new { UserId = userId },
+                    new { UserId = new Guid(userId) },
                     commandType: CommandType.StoredProcedure);
 
                 return results.Select(s => s.ToDomain()).ToList();
             }
         }
-
-        public async Task<ICollection<Site>> GetManyByUserIdAsync(string userId, bool dirty)
-        {
-            return await GetManyByUserIdAsync(userId);
-        }
     }
 }