diff --git a/NzbDrone.Core.Test/Framework/MockLib.cs b/NzbDrone.Core.Test/Framework/MockLib.cs
index 4ed4ea6c5..4ebf70d29 100644
--- a/NzbDrone.Core.Test/Framework/MockLib.cs
+++ b/NzbDrone.Core.Test/Framework/MockLib.cs
@@ -23,17 +23,6 @@ namespace NzbDrone.Core.Test.Framework
             get { return new[] { "c:\\tv\\the simpsons", "c:\\tv\\family guy", "c:\\tv\\southpark", "c:\\tv\\24" }; }
         }
 
-        public static ConfigProvider StandardConfig
-        {
-            get
-            {
-                var mock = new Mock<ConfigProvider>();
-                mock.SetupGet(c => c.SeriesRoot).Returns("C:\\");
-                return mock.Object;
-            }
-        }
-
-
         public static IDatabase GetEmptyDatabase(bool enableLogging = false, string fileName = "")
         {
             Console.WriteLine("Creating an empty PetaPoco database");
@@ -83,14 +72,5 @@ namespace NzbDrone.Core.Test.Framework
                 .With(c => c.CleanTitle = Parser.NormalizeTitle(title))
                 .Build();
         }
-
-        public static IList<Episode> GetFakeEpisodes(int seriesId)
-        {
-            var epNumber = new SequentialGenerator<int>();
-            return Builder<Episode>.CreateListOfSize(10)
-                .WhereAll().Have(c => c.SeriesId = seriesId)
-                .WhereAll().Have(c => c.EpisodeNumber = epNumber.Generate())
-                .Build();
-        }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index 1a24be68f..9c4396b4f 100644
Binary files a/NzbDrone.Core.Test/SeriesProviderTest.cs and b/NzbDrone.Core.Test/SeriesProviderTest.cs differ
diff --git a/NzbDrone.Core/Datastore/CustomeMapper.cs b/NzbDrone.Core/Datastore/CustomeMapper.cs
index 4e3362aaa..e938aabdb 100644
--- a/NzbDrone.Core/Datastore/CustomeMapper.cs
+++ b/NzbDrone.Core/Datastore/CustomeMapper.cs
@@ -5,10 +5,10 @@ namespace NzbDrone.Core.Datastore
 {
     public class CustomeMapper : DefaultMapper
     {
-        public override Func<object, object> GetFromDbConverter(DestinationInfo destinationInfo, Type SourceType)
+        public override Func<object, object> GetFromDbConverter(DestinationInfo destinationInfo, Type sourceType)
         {
 
-            if ((SourceType == typeof(Int32) || SourceType == typeof(Int64)) && destinationInfo.Type.IsGenericType && destinationInfo.Type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            if ((sourceType == typeof(Int32) || sourceType == typeof(Int64)) && destinationInfo.Type.IsGenericType && destinationInfo.Type.GetGenericTypeDefinition() == typeof(Nullable<>))
             {
                 // If it is NULLABLE, then get the underlying type. eg if "Nullable<int>" then this will return just "int"
                 Type genericArgument = destinationInfo.Type.GetGenericArguments()[0];
@@ -18,31 +18,19 @@ namespace NzbDrone.Core.Datastore
                                {
                                    int value;
                                    Int32.TryParse(s.ToString(), out value);
-                                   if (value == 0)
-                                   {
-                                       return null;
-                                   }
-
-                                   return (Nullable<DayOfWeek>)value;
+                                   return (DayOfWeek?)value;
                                };
                 }
-                else
-                {
-                    return delegate(object s)
-                    {
-                        int value;
-                        Int32.TryParse(s.ToString(), out value);
-                        if (value == 0)
-                        {
-                            return null;
-                        }
 
-                        return value;
-                    };
-                }
+                return delegate(object s)
+                           {
+                               int value;
+                               Int32.TryParse(s.ToString(), out value);
+                               return value;
+                           };
             }
 
-            return base.GetFromDbConverter(destinationInfo, SourceType);
+            return base.GetFromDbConverter(destinationInfo, sourceType);
         }
     }
 }
\ No newline at end of file
diff --git a/packages/Glimpse.0.81/lib/net40/Glimpse.Net.dll b/packages/Glimpse.0.81/lib/net40/Glimpse.Net.dll
deleted file mode 100644
index 11e2e11e9..000000000
Binary files a/packages/Glimpse.0.81/lib/net40/Glimpse.Net.dll and /dev/null differ