diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs
index e6106f01..061715cd 100644
--- a/MPF.Check/Program.cs
+++ b/MPF.Check/Program.cs
@@ -155,7 +155,6 @@ namespace MPF.Check
                 string filepath = Path.GetFullPath(args[i].Trim('"'));
 
                 // Now populate an environment
-                // TODO: Replace this with Dictionary constructor
                 var options = new Options
                 {
                     InternalProgram = Converters.ToInternalProgram(internalProgram),
diff --git a/MPF.Library/Data/SubmissionInfo.cs b/MPF.Library/Data/SubmissionInfo.cs
index a7ed250a..feda227d 100644
--- a/MPF.Library/Data/SubmissionInfo.cs
+++ b/MPF.Library/Data/SubmissionInfo.cs
@@ -75,7 +75,6 @@ namespace MPF.Data
         public KnownSystem? System { get; set; }
 
         // Name not defined by Redump
-        // TODO: Have this convert to a new `RedumpMedia?` if possible, for submission
         [JsonProperty(PropertyName = "d_media", Required = Required.AllowNull)]
         [JsonConverter(typeof(MediaTypeConverter))]
         public MediaType? Media { get; set; }
diff --git a/MPF/UIOptions.cs b/MPF/UIOptions.cs
index ee0fa014..63028cfa 100644
--- a/MPF/UIOptions.cs
+++ b/MPF/UIOptions.cs
@@ -6,8 +6,10 @@ namespace MPF
 {
     public class UIOptions
     {
-        // TODO: Is there any way that this can be made private?
-        public Options Options { get; set; }
+        /// <summary>
+        /// Internal Options object for settings storage
+        /// </summary>
+        public Options Options { get; private set; }
 
         /// <summary>
         /// Default constructor
diff --git a/MPF/ViewModels.cs b/MPF/ViewModels.cs
index e91a8367..0bb018d5 100644
--- a/MPF/ViewModels.cs
+++ b/MPF/ViewModels.cs
@@ -7,14 +7,12 @@
     {
         private readonly UIOptions _uiOptions;
 
+        /// <summary>
+        /// Access to the only setting needed cross-domain
+        /// </summary>
         public bool VerboseLogging
         {
             get { return _uiOptions.Options.VerboseLogging; }
-            set
-            {
-                _uiOptions.Options.VerboseLogging = value;
-                _uiOptions.Save(); // TODO: Why does this save here?
-            }
         }
 
         public OptionsViewModel(UIOptions uiOptions)