diff --git a/src/Application.hs b/src/Application.hs
index 1741d239a..c5898670c 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -127,6 +127,11 @@ import qualified System.Clock as Clock
 
 import Utils.Avs
 
+#ifdef DEVELOPMENT
+import Data.Maybe (fromJust)
+import Auth.OAuth2 (azureMockServer)
+#endif
+
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
 import Handler.News
@@ -341,7 +346,6 @@ makeFoundation appSettings''@AppSettings{..} = do
       appAuthKey <- clusterSetting (Proxy :: Proxy 'ClusterAuthKey) `customRunSqlPool` sqlPool
       appPersonalisedSheetFilesSeedKey <- clusterSetting (Proxy :: Proxy 'ClusterPersonalisedSheetFilesSeedKey) `customRunSqlPool` sqlPool
 
-      -- TODO: either migrate these to Foundation.Instances, or migrate additions in Foundation.Instances here
       -- TODO: use scopes from Settings
 #ifdef DEVELOPMENT
       oauth2Plugins <- liftIO $ sequence