diff --git a/src/Application.hs b/src/Application.hs
index 594378762..1741d239a 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -125,8 +125,6 @@ import Handler.Utils.Memcached (manageMemcachedLocalInvalidations)
 
 import qualified System.Clock as Clock
 
-import Data.Maybe (fromJust)
-
 import Utils.Avs
 
 -- Import all relevant handler modules here.
@@ -171,8 +169,6 @@ import Servant.API
 import Servant.Client
 import Network.HTTP.Client.TLS (mkManagerSettings)
 
-import Auth.OAuth2
-
 
 -- This line actually creates our YesodDispatch instance. It is the second half
 -- of the call to mkYesodData which occurs in Foundation.hs. Please see the
@@ -360,11 +356,11 @@ makeFoundation appSettings''@AppSettings{..} = do
         --   let mArgs = (,) <$> mID <*> mSecret
         --   guard $ isJust mArgs
         --   return . uncurry p $ fromJust mArgs
-        tenantID = case appUserAuthConf of
-          UserAuthConfSingleSource (AuthSourceConfAzureAdV2 AzureConf{..})
-            -> tshow azureConfTenantId
-          _other
-            -> error "Tenant ID missing!"
+        -- tenantID = case appUserAuthConf of
+        --   UserAuthConfSingleSource (AuthSourceConfAzureAdV2 AzureConf{..})
+        --     -> tshow azureConfTenantId
+        --   _other
+        --     -> error "Tenant ID missing!"
         oauth2Plugins
           | UserAuthConfSingleSource (AuthSourceConfAzureAdV2 AzureConf{..}) <- appUserAuthConf
             = singleton $ oauth2AzureADScoped (Set.toList azureConfScopes) (tshow azureConfClientId) azureConfClientSecret