diff --git a/yesod/src/Yesod/Default/Config.hs b/yesod/src/Yesod/Default/Config.hs
index 6e2dbf45..9e5f8a1e 100644
--- a/yesod/src/Yesod/Default/Config.hs
+++ b/yesod/src/Yesod/Default/Config.hs
@@ -180,7 +180,7 @@ loadConfig :: ConfigSettings environment extra
            -> IO (AppConfig environment extra)
 loadConfig (ConfigSettings env parseExtra getFile getObject) = do
     fp <- getFile env
-    mtopObj <- decodeFile fp
+    mtopObj <- decodeFileThrow fp
     topObj <- maybe (fail "Invalid YAML file") return mtopObj
     obj <- getObject env topObj
     m <-
@@ -233,7 +233,7 @@ withYamlEnvironment :: Show e
                     -> (Value -> Parser a) -- ^ what to do with the mapping
                     -> IO a
 withYamlEnvironment fp env f = do
-    mval <- decodeFile fp
+    mval <- decodeFileThrow fp
     case mval of
         Nothing -> fail $ "Invalid YAML file: " ++ show fp
         Just (Object obj)
diff --git a/yesod/src/Yesod/Default/Config2.hs b/yesod/src/Yesod/Default/Config2.hs
index 08abe31b..9a819ce1 100644
--- a/yesod/src/Yesod/Default/Config2.hs
+++ b/yesod/src/Yesod/Default/Config2.hs
@@ -6,7 +6,6 @@ module Yesod.Default.Config2
       configSettingsYml
     , getDevSettings
     , develMainHelper
-    , makeYesodLogger
       -- * Re-exports from Data.Yaml.Config
     , applyCurrentEnv
     , getCurrentEnv
@@ -28,7 +27,6 @@ module Yesod.Default.Config2
 
 import Data.Yaml.Config
 
-import Data.Semigroup
 import Data.Aeson
 import qualified Data.HashMap.Strict as H
 import System.Environment (getEnvironment)
@@ -39,9 +37,6 @@ import Data.Maybe (fromMaybe)
 import Control.Concurrent (forkIO, threadDelay)
 import System.Exit (exitSuccess)
 import System.Directory (doesFileExist)
-import Network.Wai.Logger (clockDateCacher)
-import Yesod.Core.Types (Logger (Logger))
-import System.Log.FastLogger (LoggerSet)
 
 #ifndef mingw32_HOST_OS
 import System.Posix.Signals (installHandler, sigINT, Handler(Catch))
@@ -117,10 +112,3 @@ develMainHelper getSettingsApp = do
 
     terminateDevel :: IO ()
     terminateDevel = exitSuccess
-
--- | Create a 'Logger' value (from yesod-core) out of a 'LoggerSet' (from
--- fast-logger).
-makeYesodLogger :: LoggerSet -> IO Logger
-makeYesodLogger loggerSet' = do
-    (getter, _) <- clockDateCacher
-    return $! Yesod.Core.Types.Logger loggerSet' getter
diff --git a/yesod/src/Yesod/Default/Handlers.hs b/yesod/src/Yesod/Default/Handlers.hs
index 8abc57fa..f2547d51 100644
--- a/yesod/src/Yesod/Default/Handlers.hs
+++ b/yesod/src/Yesod/Default/Handlers.hs
@@ -6,8 +6,8 @@ module Yesod.Default.Handlers
 
 import Yesod.Core
 
-getFaviconR :: MonadHandler m => m ()
+getFaviconR :: HasHandlerData env => RIO env ()
 getFaviconR = sendFile "image/x-icon" "config/favicon.ico"
 
-getRobotsR :: MonadHandler m => m ()
+getRobotsR :: HasHandlerData env => RIO env ()
 getRobotsR = sendFile "text/plain" "config/robots.txt"