diff --git a/TsRandomizer/Screens/GameplayScreen.cs b/TsRandomizer/Screens/GameplayScreen.cs
index 4229474b..0429e35e 100644
--- a/TsRandomizer/Screens/GameplayScreen.cs
+++ b/TsRandomizer/Screens/GameplayScreen.cs
@@ -174,9 +174,6 @@ public override void Update(GameTime gameTime, InputState input)
 
 			deathLinkService?.Update(Level, ScreenManager);
 
-			if (Settings.MeleeAutofire.Value)
-				GamePadWrapper.GetProperty("IsMeleeDown").SetValue(Level.MainHero.AsDynamic()._gamePadWrapper, false, null);
-
 			if (Settings.ExtraEarringsXP.Value > 0)
 			{
 				OrbExperienceManager.UpdateHitRegistry(Level.MainHero);
diff --git a/TsRandomizer/Screens/OptionsMenuScreen.cs b/TsRandomizer/Screens/OptionsMenuScreen.cs
index 76d9c0a4..367a7970 100644
--- a/TsRandomizer/Screens/OptionsMenuScreen.cs
+++ b/TsRandomizer/Screens/OptionsMenuScreen.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Timespinner.GameAbstractions;
 using Timespinner.GameStateManagement.ScreenManager;
@@ -31,6 +32,11 @@ void AddSettingButton(MenuEntry settingButton)
 			settingButton.DoesDrawLargeShadow = false;
 
 			var buttons = (IList)((object)Dynamic._primaryMenuCollection).AsDynamic()._entries;
+			// Delete Passwords Menu if present
+			if (buttons[buttons.Count - 1].AsDynamic().Text == "Passwords")
+			{
+				buttons.RemoveAt(buttons.Count - 1);
+			}
 			buttons.Add(settingButton.AsTimeSpinnerMenuEntry());
 
 			((object)Dynamic._primaryMenuCollection).AsDynamic()._entries = buttons.ToList(MainMenuEntryType);
diff --git a/TsRandomizer/Settings/GameSettingsLoader.cs b/TsRandomizer/Settings/GameSettingsLoader.cs
index e6ee966b..aa0009a7 100644
--- a/TsRandomizer/Settings/GameSettingsLoader.cs
+++ b/TsRandomizer/Settings/GameSettingsLoader.cs
@@ -330,8 +330,6 @@ public static SettingCollection LoadSettingsFromSlotData(Dictionary<string, obje
 				SetNumberGameSetting(settings.LevelCap, levelCap);
 			if (slotData.TryGetValue("ExtraEarringsXP", out var extraEarringsXP))
 				SetNumberGameSetting(settings.ExtraEarringsXP, extraEarringsXP);
-			if (slotData.TryGetValue("MeleeAutofire", out var meleeAutofire))
-				settings.MeleeAutofire.Value = IsTrue(meleeAutofire);
 
 			if (slotData.TryGetValue("ShowDrops", out var showDrops))
 				settings.ShowDrops.Value = IsTrue(showDrops);
diff --git a/TsRandomizer/Settings/SettingCollection.cs b/TsRandomizer/Settings/SettingCollection.cs
index 93af085c..ec15b056 100644
--- a/TsRandomizer/Settings/SettingCollection.cs
+++ b/TsRandomizer/Settings/SettingCollection.cs
@@ -45,7 +45,7 @@ public class SettingCollection
 				}},
 			new GameSettingCategoryInfo { Name = "Other", Description = "Miscellaneous settings",
 				SettingsPerCategory = new List<Func<SettingCollection, GameSetting>> {
-					s => s.ShowBestiary, s => s.ShowDrops, s => s.MeleeAutofire, s => s.NoSaveStatues, s => s.EnableMapFromStart
+					s => s.ShowBestiary, s => s.ShowDrops, s => s.NoSaveStatues, s => s.EnableMapFromStart
 				}}
 		};
 
@@ -259,10 +259,6 @@ public class SettingCollection
 		public NumberGameSetting ExtraEarringsXP = new NumberGameSetting("Extra Earrings XP",
 			"Adds additional XP granted by Galaxy Earrings", 0, 24, 1, 0, true);
 
-		[DoesNotAffectCompetitiveBalance]
-		public OnOffGameSetting MeleeAutofire = new OnOffGameSetting("Autofire (Melee)",
-			"Holding the melee attack button will attack repeatedly.", false, true);
-
 		public OnOffGameSetting NoSaveStatues = new OnOffGameSetting("No Save Statues",
 			"Breaks all the save statues", false, true);