diff --git a/public/options/options.html b/public/options/options.html
index 92cba820..a4530a02 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -81,23 +81,6 @@
 				</div>
 			</div>
 
-			<br/>
-			<br/>
-
-			<div option-type="toggle" toggle-type="reverse" sync-option="disableAutoSkip">
-				<label class="switch-container" label-name="__MSG_autoSkip__">
-					<label class="switch">
-						<input type="checkbox" checked>
-						<span class="slider round"></span>
-					</label>
-				</label>
-	
-				<br/>
-				<br/>
-	
-				<div class="small-description">__MSG_autoSkipDescription__</div>
-			</div>
-
 			<br/>
 			<br/>
 	
diff --git a/src/config.ts b/src/config.ts
index cc403e13..a28d834f 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -233,11 +233,14 @@ function fetchConfig() {
     });
 }
 
-function migrateOldFormats() { // Convert sponsorTimes format
-    for (const key in Config.localConfig) {
-        if (key.startsWith("sponsorTimes") && key !== "sponsorTimes" && key !== "sponsorTimesContributed") {
-            Config.config.sponsorTimes.set(key.substr(12), Config.config[key]);
-            delete Config.config[key];
+function migrateOldFormats() {
+    if (Config.config["disableAutoSkip"]) {
+        for (const selection of Config.config.categorySelections) {
+            if (selection.name === "sponsor") {
+                selection.option = CategorySkipOption.ManualSkip;
+
+                chrome.storage.sync.remove("disableAutoSkip");
+            }
         }
     }
 }
diff --git a/src/content.ts b/src/content.ts
index a8c0ad4c..e40bd40f 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -34,7 +34,7 @@ var seekListenerSetUp = false
 var hiddenSponsorTimes: number[] = [];
 
 /** @type {Array[boolean]} Has the sponsor been skipped */
-var sponsorSkipped = [];
+var sponsorSkipped: boolean[] = [];
 
 //the video
 var video: HTMLVideoElement;