diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index b7ce75ab11..d7a8624d14 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1298,7 +1298,7 @@ NextScreen=Branch.AfterSelectProfile()
 PrevScreen=Branch.TitleMenu()
 StartScreen=Branch.AfterSelectProfile()
 #
-TimerSeconds=30
+TimerSeconds=-1
 #
 CodeNames=SelectProfileKeys()
 CodeUp="+MenuUp"
@@ -1317,7 +1317,7 @@ Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 NextScreen=Branch.AfterSelectStyle()
 PrevScreen=Branch.TitleMenu()
-TimerSeconds=30
+TimerSeconds=-1
 #
 DefaultChoice="Single"
 # Giant metric list left in for backwards compatibility.
@@ -1357,7 +1357,7 @@ Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 NextScreen=Branch.GetGameInformationScreen
 PrevScreen=Branch.TitleMenu()
-TimerSeconds=30
+TimerSeconds=-1
 #
 DefaultChoice="Normal"
 ChoiceNames="Normal"
@@ -1378,7 +1378,7 @@ Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 NextScreen="ScreenSelectMusic"
 PrevScreen=Branch.TitleMenu()
-TimerSeconds=15
+TimerSeconds=-1
 #
 DefaultChoice="Delay"
 ChoiceNames="Delay"
@@ -1400,9 +1400,9 @@ PlayerOptionsScreen="ScreenPlayerOptions"
 MusicWheelType="MusicWheel"
 Codes=""
 #
-TimerSeconds=120
+TimerSeconds=-1
 DoRouletteOnMenuTimer=true
-RouletteTimerSeconds=15
+RouletteTimerSeconds=-1
 IdleCommentSeconds=20
 HardCommentMeter=10
 #
@@ -2421,7 +2421,7 @@ NextScreen=Branch.SongOptions()
 #
 PlayMusic=false
 #
-TimerSeconds=30
+TimerSeconds=-1
 #
 LineNames="1,2,3A,3B,4,5,6,R1,R2,7,8,9,10,11,12,13,14,16"
 Line1="lua,ArbitrarySpeedMods()"
@@ -2454,7 +2454,7 @@ Fallback="ScreenOptions"
 Class="ScreenSongOptions"
 PrevScreen="ScreenPlayerOptions"
 NextScreen="ScreenStageInformation"
-TimerSeconds=30
+TimerSeconds=-1
 PlayMusic=false
 StopMusicOnBack=false
 #
@@ -2577,7 +2577,7 @@ Class="ScreenEvaluation"
 Fallback="ScreenWithMenuElements"
 NextScreen=Branch.AfterEvaluation()
 PrevScreen=Branch.AfterEvaluation()
-TimerSeconds=20
+TimerSeconds=-1
 CheerDelaySeconds=2.5
 
 [ScreenEvaluationNormal]
diff --git a/src/Etterna/Actor/Menus/BPMDisplay.h b/src/Etterna/Actor/Menus/BPMDisplay.h
index b70cf4cbb2..2f38236e89 100644
--- a/src/Etterna/Actor/Menus/BPMDisplay.h
+++ b/src/Etterna/Actor/Menus/BPMDisplay.h
@@ -82,7 +82,6 @@ class BPMDisplay : public BitmapText
 	ThemeMetric<bool> SHOW_QMARKS;
 	/** @brief How often the random BPMs cycle themselves. */
 	ThemeMetric<float> RANDOM_CYCLE_SPEED;
-	ThemeMetric<float> COURSE_CYCLE_SPEED;
 	/** @brief The text used to separate the low and high BPMs. */
 	ThemeMetric<std::string> SEPARATOR;
 	/** @brief The text used when there is no BPM. */