Clean up warnings and remove unused files.

2 files changed, 7 insertions, 8 deletions

diff --git a/src/Language/Fiddle/Internal/Scopes.hs b/src/Language/Fiddle/Internal/Scopes.hs
index 02c9a5a..70cadee 100644
--- a/src/Language/Fiddle/Internal/Scopes.hs
+++ b/src/Language/Fiddle/Internal/Scopes.hs
@@ -2,10 +2,9 @@
 
 module Language.Fiddle.Internal.Scopes where
 
-import Control.Monad (forM)
 import Data.Aeson
 import Data.Aeson.Key
-import Data.List (inits, intercalate)
+import Data.List (inits)
 import Data.List.NonEmpty (NonEmpty (..), prependList)
 import Data.Map (Map)
 import qualified Data.Map as Map
@@ -129,10 +128,10 @@ lookupScopeWithPath (ScopePath current others) key scope =
           Nothing -> []
 
 instance (ToJSONKey k, ToJSON v, Ord k) => ToJSON (Scope k v) where
-  toJSON (Scope subScopes scopeValues) =
+  toJSON scope =
     object
-      [ fromString "subScopes" .= toJSON subScopes,
-        fromString "scopeValues" .= toJSON scopeValues
+      [ fromString "subScopes" .= toJSON (subScopes scope),
+        fromString "scopeValues" .= toJSON (scopeValues scope)
       ]
 
 instance (FromJSONKey k, FromJSON v, Ord k) => FromJSON (Scope k v) where
diff --git a/src/Language/Fiddle/Internal/UnitInterface.hs b/src/Language/Fiddle/Internal/UnitInterface.hs
index 4244121..aacb71d 100644
--- a/src/Language/Fiddle/Internal/UnitInterface.hs
+++ b/src/Language/Fiddle/Internal/UnitInterface.hs
@@ -67,10 +67,10 @@ data ExportedValue where
   deriving (Show, Eq, Ord, Generic, FromJSON, ToJSON)
 
 instance ToJSON UnitInterface where
-  toJSON (UnitInterface rootScope dependencies) =
+  toJSON ui =
     object
-      [ "rootScope" .= rootScope,
-        "dependencies" .= dependencies
+      [ "rootScope" .= rootScope ui,
+        "dependencies" .= dependencies ui
       ]
 
 instance FromJSON UnitInterface where