diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index 1e74c23..deb1a38 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -203,9 +203,10 @@ Executable ghc-mod
   Default-Language:     Haskell2010
   Main-Is:              GHCMod.hs
   Other-Modules:        Paths_ghc_mod
+                      , GHCMod.Options
                       , GHCMod.Options.Commands
-                      , GHCMod.Options.ShellParse
                       , GHCMod.Version
+                      , GHCMod.Options.ShellParse
   GHC-Options:          -Wall -fno-warn-deprecations -threaded
   Default-Extensions:   ConstraintKinds, FlexibleContexts
   HS-Source-Dirs:       src
diff --git a/src/GHCMod.hs b/src/GHCMod.hs
index f67e9b9..531f7de 100644
--- a/src/GHCMod.hs
+++ b/src/GHCMod.hs
@@ -19,7 +19,6 @@ import System.Directory (setCurrentDirectory, getAppUserDataDirectory,
 import System.IO
 import System.Exit
 import Text.PrettyPrint hiding ((<>))
-import Language.Haskell.GhcMod.Options.Options
 import GHCMod.Options
 import Prelude
 
diff --git a/src/GHCMod/Options.hs b/src/GHCMod/Options.hs
index b7b13d0..c3cf263 100644
--- a/src/GHCMod/Options.hs
+++ b/src/GHCMod/Options.hs
@@ -19,20 +19,15 @@
 module GHCMod.Options (
   parseArgs,
   parseArgsInteractive,
-  GhcModCommands(..),
+  GhcModCommands(..)
 ) where
 
 import Options.Applicative
 import Options.Applicative.Types
 import Language.Haskell.GhcMod.Types
--- import Control.Arrow
--- import Data.Char (toUpper, toLower)
--- import Data.List (intercalate)
--- import Language.Haskell.GhcMod.Read
 import GHCMod.Options.Commands
 import GHCMod.Version
 import Language.Haskell.GhcMod.Options.DocUtils
--- import Language.Haskell.GhcMod.Options.Help
 import Language.Haskell.GhcMod.Options.Options
 import GHCMod.Options.ShellParse