diff --git a/scripts/songselect/filterwheel.lua b/scripts/songselect/filterwheel.lua
index 9db3a95..e555b1c 100644
--- a/scripts/songselect/filterwheel.lua
+++ b/scripts/songselect/filterwheel.lua
@@ -101,10 +101,6 @@ local transitionScrollScale = 0;
 local transitionScrollOffsetY = 0;
 local scrollingUp = false;
 
-local transitionEnterReverse = false;
-local transitionEnterScale = 0;
-local transitionEnterOffsetY = 0;
-
 local transitionLeaveScale = 1;
 local transitionLeaveReappearTimer = 0;
 local TRANSITION_LEAVE_DURATION = 0.1;
@@ -226,7 +222,7 @@ function drawFolderList()
         folderList = filters.level;
     end
 
-    yOffset = transitionEnterOffsetY + transitionScrollOffsetY;
+    local yOffset = transitionScrollOffsetY;
 
     local i = 1;
     while (i <= numOfItemsAround) do
@@ -336,13 +332,8 @@ render = function(deltatime, shown)
 
     if not shown then
         game.SetSkinSetting('_songWheelOverlayActive', 0);
-        if (transitionEnterScale <= 0) then
-            game.SetSkinSetting('_songWheelDespawnSelectorElements', 0);
-        end
-
     else
         game.SetSkinSetting('_songWheelOverlayActive', 1);
-        game.SetSkinSetting('_songWheelDespawnSelectorElements', 1);
     end
     
     game.SetSkinSetting('_songWheelActiveFolderLabel', getFolderData(filters.folder[selectedFolder]).label);
diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua
index 0f931bb..af0d786 100644
--- a/scripts/songselect/songwheel.lua
+++ b/scripts/songselect/songwheel.lua
@@ -138,10 +138,9 @@ local transitionFlashScale = 0;
 local transitionFlashAlpha = 1;
 
 local isFilterWheelActive = false;
-local transitionLeaveReappearTimer = 0;
 local transitionLeaveScale = 0;
+local transitionLeaveReappearTimer = 0;
 local TRANSITION_LEAVE_DURATION = 0.1;
-local transitionLeaveOffsetY = 0; -- TODO: remove
 
 function resetLayoutInformation()
     resx, resy = game.GetResolution()
@@ -366,7 +365,7 @@ function drawSongList()
 
     local numOfSongsAround = 7; -- How many songs should be up and how many should be down of the selected one
 
-    local yOffset = transitionLeaveOffsetY + transitionScrollOffsetY;
+    local yOffset = transitionScrollOffsetY;
 
     local i=1;
     while (i <= numOfSongsAround) do