remove 163 lines of code without changing anything except imports

18 files changed, 16 insertions, 18 deletions

diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index 1286e4590..265828dbb 100644
--- a/Assistant/Alert.hs
+++ b/Assistant/Alert.hs
@@ -9,7 +9,7 @@
 
 module Assistant.Alert where
 
-import Common.Annex
+import Annex.Common
 import Assistant.Types.Alert
 import Assistant.Alert.Utility
 import qualified Remote
diff --git a/Assistant/Alert/Utility.hs b/Assistant/Alert/Utility.hs
index 65484e0e6..5a6c73b85 100644
--- a/Assistant/Alert/Utility.hs
+++ b/Assistant/Alert/Utility.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Alert.Utility where
 
-import Common.Annex
+import Annex.Common
 import Assistant.Types.Alert
 import Utility.Tense
 
diff --git a/Assistant/Common.hs b/Assistant/Common.hs
index 5fab84290..d26d2b07a 100644
--- a/Assistant/Common.hs
+++ b/Assistant/Common.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Common (module X) where
 
-import Common.Annex as X
+import Annex.Common as X
 import Assistant.Monad as X
 import Assistant.Types.DaemonStatus as X
 import Assistant.Types.NamedThread as X
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs
index a34264a01..5662209c9 100644
--- a/Assistant/Monad.hs
+++ b/Assistant/Monad.hs
@@ -28,7 +28,7 @@ module Assistant.Monad (
 import "mtl" Control.Monad.Reader
 import System.Log.Logger
 
-import Common.Annex
+import Annex.Common
 import Assistant.Types.ThreadedMonad
 import Assistant.Types.DaemonStatus
 import Assistant.Types.ScanRemotes
diff --git a/Assistant/NamedThread.hs b/Assistant/NamedThread.hs
index f80953053..7acb70132 100644
--- a/Assistant/NamedThread.hs
+++ b/Assistant/NamedThread.hs
@@ -9,7 +9,7 @@
 
 module Assistant.NamedThread where
 
-import Common.Annex
+import Annex.Common
 import Assistant.Types.NamedThread
 import Assistant.Types.ThreadName
 import Assistant.Types.DaemonStatus
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs
index 2390379e2..34c5aab1f 100644
--- a/Assistant/Pairing.hs
+++ b/Assistant/Pairing.hs
@@ -9,7 +9,7 @@
 
 module Assistant.Pairing where
 
-import Common.Annex
+import Annex.Common
 import Utility.Verifiable
 import Assistant.Ssh
 
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs
index 80fb5c19a..fb82586b8 100644
--- a/Assistant/Ssh.hs
+++ b/Assistant/Ssh.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Ssh where
 
-import Common.Annex
+import Annex.Common
 import Utility.Tmp
 import Utility.Shell
 import Utility.Rsync
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs
index f42462e52..a4f037f5a 100644
--- a/Assistant/Threads/SanityChecker.hs
+++ b/Assistant/Threads/SanityChecker.hs
@@ -40,7 +40,6 @@ import Assistant.Unused
 import Logs.Unused
 import Logs.Transfer
 import Annex.Path
-import Types.Key (keyBackendName)
 import qualified Annex
 #ifdef WITH_WEBAPP
 import Assistant.WebApp.Types
diff --git a/Assistant/Types/Buddies.hs b/Assistant/Types/Buddies.hs
index 2887aaef0..432440d2e 100644
--- a/Assistant/Types/Buddies.hs
+++ b/Assistant/Types/Buddies.hs
@@ -9,7 +9,7 @@
 
 module Assistant.Types.Buddies where
 
-import Common.Annex
+import Annex.Common
 
 import qualified Data.Map as M
 import Control.Concurrent.STM
diff --git a/Assistant/Types/DaemonStatus.hs b/Assistant/Types/DaemonStatus.hs
index e1b6c997e..d9259843b 100644
--- a/Assistant/Types/DaemonStatus.hs
+++ b/Assistant/Types/DaemonStatus.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.DaemonStatus where
 
-import Common.Annex
+import Annex.Common
 import Assistant.Pairing
 import Utility.NotificationBroadcaster
 import Logs.Transfer
diff --git a/Assistant/Types/NetMessager.hs b/Assistant/Types/NetMessager.hs
index 475d810ae..da6682233 100644
--- a/Assistant/Types/NetMessager.hs
+++ b/Assistant/Types/NetMessager.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.NetMessager where
 
-import Common.Annex
+import Annex.Common
 import Assistant.Pairing
 import Git.Types
 
diff --git a/Assistant/Types/Pushes.hs b/Assistant/Types/Pushes.hs
index 0da8b44b5..ff860a0c1 100644
--- a/Assistant/Types/Pushes.hs
+++ b/Assistant/Types/Pushes.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.Pushes where
 
-import Common.Annex
+import Annex.Common
 
 import Control.Concurrent.STM
 import Data.Time.Clock
diff --git a/Assistant/Types/ScanRemotes.hs b/Assistant/Types/ScanRemotes.hs
index ac6d8fef9..84a9ee659 100644
--- a/Assistant/Types/ScanRemotes.hs
+++ b/Assistant/Types/ScanRemotes.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.ScanRemotes where
 
-import Common.Annex
+import Annex.Common
 
 import Control.Concurrent.STM
 import qualified Data.Map as M
diff --git a/Assistant/Types/ThreadedMonad.hs b/Assistant/Types/ThreadedMonad.hs
index eadf325ea..ccb35d023 100644
--- a/Assistant/Types/ThreadedMonad.hs
+++ b/Assistant/Types/ThreadedMonad.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.ThreadedMonad where
 
-import Common.Annex
+import Annex.Common
 import qualified Annex
 
 import Control.Concurrent
diff --git a/Assistant/Types/TransferQueue.hs b/Assistant/Types/TransferQueue.hs
index 73a7521c5..ee9409a4b 100644
--- a/Assistant/Types/TransferQueue.hs
+++ b/Assistant/Types/TransferQueue.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.TransferQueue where
 
-import Common.Annex
+import Annex.Common
 import Logs.Transfer
 
 import Control.Concurrent.STM
diff --git a/Assistant/Types/TransferrerPool.hs b/Assistant/Types/TransferrerPool.hs
index 697bb8dd5..a2425eb62 100644
--- a/Assistant/Types/TransferrerPool.hs
+++ b/Assistant/Types/TransferrerPool.hs
@@ -7,7 +7,7 @@
 
 module Assistant.Types.TransferrerPool where
 
-import Common.Annex
+import Annex.Common
 import Utility.NotificationBroadcaster
 import Assistant.Types.DaemonStatus
 
diff --git a/Assistant/Unused.hs b/Assistant/Unused.hs
index 55a04c597..26d59cf69 100644
--- a/Assistant/Unused.hs
+++ b/Assistant/Unused.hs
@@ -13,7 +13,6 @@ import qualified Data.Map as M
 
 import Assistant.Common
 import qualified Git
-import Types.Key
 import Logs.Unused
 import Logs.Location
 import Annex.Content
diff --git a/Assistant/XMPP/Buddies.hs b/Assistant/XMPP/Buddies.hs
index 29e0e24cf..77eb3202f 100644
--- a/Assistant/XMPP/Buddies.hs
+++ b/Assistant/XMPP/Buddies.hs
@@ -8,7 +8,7 @@
 module Assistant.XMPP.Buddies where
 
 import Assistant.XMPP
-import Common.Annex
+import Annex.Common
 import Assistant.Types.Buddies
 
 import Network.Protocol.XMPP