diff --git a/base/shell/rshell/CDesktopBrowser.cpp b/base/shell/rshell/CDesktopBrowser.cpp
index acffbd26177..928d0ee4708 100644
--- a/base/shell/rshell/CDesktopBrowser.cpp
+++ b/base/shell/rshell/CDesktopBrowser.cpp
@@ -417,14 +417,16 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
             }
             else
             {
+
+                /* FIXME: Update work area */
+#if 0
                 RECT rcDesktop;
 
                 rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
                 rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
                 rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN);
                 rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-
-                /* FIXME: Update work area */
+#endif
             }
             break;
 
diff --git a/base/shell/rshell/CMenuFocusManager.cpp b/base/shell/rshell/CMenuFocusManager.cpp
index 598a112cca5..36ef3d00418 100644
--- a/base/shell/rshell/CMenuFocusManager.cpp
+++ b/base/shell/rshell/CMenuFocusManager.cpp
@@ -396,12 +396,10 @@ LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg)
 
     TRACE("MouseDown %d\n", m_isLButtonDown);
 
-    BOOL isTracking = FALSE;
     if (entry)
     {
         ScreenToClient(child, &pt);
         iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt);
-        isTracking = entry->mb->_IsTracking();
 
         if (iHitTestResult >= 0)
         {
@@ -448,12 +446,10 @@ LRESULT CMenuFocusManager::ProcessMouseUp(MSG* msg)
 
     TRACE("MouseUp %d\n", m_isLButtonDown);
 
-    BOOL isTracking = FALSE;
     if (entry)
     {
         ScreenToClient(child, &pt);
         iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt);
-        isTracking = entry->mb->_IsTracking();
 
         if (iHitTestResult >= 0)
         {