diff --git a/NzbDrone.Api/Series/SeriesResource.cs b/NzbDrone.Api/Series/SeriesResource.cs
index 8ea27fe4a..e9284736f 100644
--- a/NzbDrone.Api/Series/SeriesResource.cs
+++ b/NzbDrone.Api/Series/SeriesResource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using NzbDrone.Api.REST;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Series
diff --git a/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs b/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs
index e196856bf..d7100fa71 100644
--- a/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs
+++ b/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs
@@ -16,10 +16,12 @@ namespace NzbDrone.Common.EnvironmentInfo
     public class AppFolderInfo : IAppFolderInfo
     {
         private readonly IDiskProvider _diskProvider;
+        private readonly Logger _logger;
 
         public AppFolderInfo(IDiskProvider diskProvider)
         {
             _diskProvider = diskProvider;
+            _logger = LogManager.GetCurrentClassLogger();
             AppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData, Environment.SpecialFolderOption.DoNotVerify), "NzbDrone");
             StartUpFolder = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName;
             TempFolder = Path.GetTempPath();
@@ -54,7 +56,7 @@ namespace NzbDrone.Common.EnvironmentInfo
             }
             catch (Exception ex)
             {
-                //Todo: Add logging
+                _logger.WarnException("Coudn't set app folder permission", ex);
             }
         }
 
diff --git a/NzbDrone.Core/Datastore/BasicRepository.cs b/NzbDrone.Core/Datastore/BasicRepository.cs
index 1ca871339..46c2b32f5 100644
--- a/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -40,9 +40,6 @@ namespace NzbDrone.Core.Datastore
         private readonly IDatabase _database;
         private readonly IMessageAggregator _messageAggregator;
 
-        //TODO: add assertion to make sure model properly mapped 
-
-
         private IDataMapper DataMapper
         {
             get { return _database.DataMapper; }
diff --git a/NzbDrone.Core/IndexerSearch/Definitions/SingleEpisodeSearchCriteria.cs b/NzbDrone.Core/IndexerSearch/Definitions/SingleEpisodeSearchCriteria.cs
index 717a4da3f..371f66bc6 100644
--- a/NzbDrone.Core/IndexerSearch/Definitions/SingleEpisodeSearchCriteria.cs
+++ b/NzbDrone.Core/IndexerSearch/Definitions/SingleEpisodeSearchCriteria.cs
@@ -2,7 +2,6 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
 {
     public class SingleEpisodeSearchCriteria : SearchCriteriaBase
     {
-        //TODO make sure these are populated with scene if required
         public int EpisodeNumber { get; set; }
         public int SeasonNumber { get; set; }
 
diff --git a/NzbDrone.Core/Parser/ParsingService.cs b/NzbDrone.Core/Parser/ParsingService.cs
index a9ff33319..b2e39af83 100644
--- a/NzbDrone.Core/Parser/ParsingService.cs
+++ b/NzbDrone.Core/Parser/ParsingService.cs
@@ -95,7 +95,6 @@ namespace NzbDrone.Core.Parser
             {
                 if (series.SeriesType == SeriesTypes.Standard)
                 {
-                    //Todo: Collect this as a Series we want to treat as a daily series, or possible parsing error
                     _logger.Warn("Found daily-style episode for non-daily series: {0}.", series);
                     return new List<Episode>();
                 }
diff --git a/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs b/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs
index 402e11af1..4bb38aebf 100644
--- a/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs
+++ b/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs
@@ -43,7 +43,6 @@ namespace NzbDrone.Update.UpdateEngine
                 }
             }
 
-            //TODO:Should be able to restart service if anything beyond this point fails
             _logger.Info("Killing all running processes");
 
             if (_processProvider.GetProcessByName(ProcessProvider.NzbDroneConsoleProcessName).Any())