diff --git a/benchmark/benchmark-pandoc.hs b/benchmark/benchmark-pandoc.hs
index d9347c539..a667a6f81 100644
--- a/benchmark/benchmark-pandoc.hs
+++ b/benchmark/benchmark-pandoc.hs
@@ -16,7 +16,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 import Text.Pandoc
-import Text.Pandoc.Class hiding (getCurrentTime, trace)
 import qualified Text.Pandoc.UTF8 as UTF8
 import Data.Text (Text)
 import Data.Time (getCurrentTime)
@@ -38,7 +37,8 @@ readerBench doc (name, reader) =
                        $ writer def{ writerWrapText = WrapAuto} doc
          in return $ bench (name ++ " reader") $ nf
                  (reader def) inp
-       _ -> trace ("\nCould not find writer for " ++ name ++ "\n") Nothing
+       _ -> Debug.Trace.trace
+             ("\nCould not find writer for " ++ name ++ "\n") Nothing
 
 writerBench :: Pandoc
             -> (String, WriterOptions -> Pandoc -> Text)
@@ -66,7 +66,7 @@ main = do
   inp <- UTF8.toText <$> B.readFile "test/testsuite.txt"
   lalune <- B.readFile "test/lalune.jpg"
   movie <- B.readFile "test/movie.jpg"
-  time <- getCurrentTime
+  time <- Data.Time.getCurrentTime
   let setupFakeFiles = modifyPureState $ \st -> st{ stFiles =
                         FileTree $ Map.fromList [
                            ("lalune.jpg", FileInfo time lalune),
diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs
index f0e953d53..3cf6f0788 100644
--- a/src/Text/Pandoc/App.hs
+++ b/src/Text/Pandoc/App.hs
@@ -77,11 +77,6 @@ import System.IO.Error (isDoesNotExistError)
 import Text.Pandoc
 import Text.Pandoc.BCP47 (Lang (..), parseBCP47)
 import Text.Pandoc.Builder (setMeta)
-import Text.Pandoc.Class (PandocIO, extractMedia, fillMediaBag, getLog, openURL,
-                          readDataFile, readDefaultDataFile, readFileStrict,
-                          report, setInputFiles, setOutputFile,
-                          setRequestHeader, setResourcePath, setTrace,
-                          setTranslations, setUserDataDir)
 import Text.Pandoc.Highlighting (highlightingStyles)
 import Text.Pandoc.Lua (LuaException (..), runLuaFilter)
 import Text.Pandoc.PDF (makePDF)