diff --git a/bin/xmobar.hs b/bin/xmobar.hs
index 9f76230..0fb474e 100644
--- a/bin/xmobar.hs
+++ b/bin/xmobar.hs
@@ -28,22 +28,15 @@ import           Xmobar.Plugins.Screensaver
 import           Xmobar.Plugins.VPN
 
 import           System.Posix.Signals
-import           XMonad.Core
-    ( cfgDir
-    , getDirectories
-    , io
-    )
-import           XMonad.Hooks.DynamicLog                        (wrap)
+import           XMonad.Core                                    hiding (config)
+import           XMonad.Hooks.DynamicLog                        hiding (xmobar)
 import           XMonad.Internal.Command.Desktop
 import           XMonad.Internal.Command.Power
 import           XMonad.Internal.DBus.Brightness.ClevoKeyboard
 import           XMonad.Internal.DBus.Brightness.IntelBacklight
 import           XMonad.Internal.DBus.Control
 import           XMonad.Internal.DBus.Screensaver               (ssSignalDep)
-import           XMonad.Internal.Process
-    ( proc'
-    , readCreateProcessWithExitCode'
-    )
+import           XMonad.Internal.Process                        hiding (CmdSpec)
 import qualified XMonad.Internal.Theme                          as T
 import           Xmobar                                         hiding
     ( iconOffset
diff --git a/bin/xmonad.hs b/bin/xmonad.hs
index 7d31a1f..4e41d84 100644
--- a/bin/xmonad.hs
+++ b/bin/xmonad.hs
@@ -7,19 +7,14 @@
 module Main (main) where
 
 import           Control.Concurrent
-import           Control.Concurrent.Lifted                      (fork)
+import           Control.Concurrent.Lifted
 import           Control.Monad
 
 import           Data.Internal.DBus
 import           Data.Internal.Dependency
 import           Data.List
-    ( intercalate
-    , isPrefixOf
-    , sortBy
-    , sortOn
-    )
 import           Data.Maybe
-import           Data.Monoid                                    (All (..))
+import           Data.Monoid
 
 import           Graphics.X11.Types
 import           Graphics.X11.Xlib.Atom
@@ -35,10 +30,6 @@ import           XMonad.Actions.CycleWS
 import           XMonad.Actions.PhysicalScreens
 import           XMonad.Actions.Warp
 import           XMonad.Hooks.DynamicLog
-    ( pad
-    , wrap
-    , xmobarColor
-    )
 import           XMonad.Hooks.EwmhDesktops
 import           XMonad.Hooks.ManageDocks
 import           XMonad.Hooks.ManageHelpers