diff --git a/Libraries/iTasks/WF/Combinators/Common.dcl b/Libraries/iTasks/WF/Combinators/Common.dcl
index 2608a05c053d859a9edfd3af061801fb3241a8c0..ec27d10af303abefad663db7ba5b2a0ba0faf639 100644
--- a/Libraries/iTasks/WF/Combinators/Common.dcl
+++ b/Libraries/iTasks/WF/Combinators/Common.dcl
@@ -5,10 +5,7 @@ definition module iTasks.WF.Combinators.Common
 import iTasks.SDS.Definition
 import iTasks.WF.Combinators.Core
 from iTasks.WF.Tasks.Interaction import :: ChoiceOption
-
-from StdBool					import not
-from Data.Map				    import :: Map
-from Data.Either				import :: Either
+from Data.Either import :: Either
 
 instance Functor Task
 
diff --git a/Libraries/iTasks/WF/Combinators/Common.icl b/Libraries/iTasks/WF/Combinators/Common.icl
index 40c206ccec391f07d9a47ed0ef25e17b3fd42fc3..ad29f95ac228da0b32a507683dc85af5dd6872b2 100644
--- a/Libraries/iTasks/WF/Combinators/Common.icl
+++ b/Libraries/iTasks/WF/Combinators/Common.icl
@@ -5,23 +5,18 @@ implementation module iTasks.WF.Combinators.Common
 import StdEnv
 import Data.Functor
 import Data.Func
-import Data.Map.GenJSON
 import qualified Data.Map as DM
 
 import iTasks.Engine
 import iTasks.Internal.SDS
-import iTasks.Internal.Serialization
 import iTasks.SDS.Combinators.Common
 import iTasks.SDS.Sources.Core
 import iTasks.SDS.Sources.System
 import iTasks.UI.Definition
-import iTasks.UI.Editor
 import iTasks.UI.Editor.Controls
-import iTasks.UI.Layout
 import iTasks.UI.Layout.Common, iTasks.UI.Layout.Default
 import iTasks.UI.Tune
 import iTasks.WF.Combinators.Core
-import iTasks.WF.Combinators.SDS
 import iTasks.WF.Derives
 import iTasks.WF.Tasks.Core
 import iTasks.WF.Tasks.Interaction
diff --git a/Libraries/iTasks/WF/Tasks/SDS.dcl b/Libraries/iTasks/WF/Tasks/SDS.dcl
index 6710db2b36a509bd6c12d4301ad563ad68bb5976..f97e9d28b792e890fbaf9ac1456fbcf0ebd128a2 100644
--- a/Libraries/iTasks/WF/Tasks/SDS.dcl
+++ b/Libraries/iTasks/WF/Tasks/SDS.dcl
@@ -2,17 +2,9 @@ definition module iTasks.WF.Tasks.SDS
 /**
 * This module provides the core tasks for accessing shared data sources.
 */
-from iTasks.WF.Definition import :: Task, class iTask
+from iTasks.WF.Definition import :: Task
 import iTasks.SDS.Definition
 
-from iTasks.UI.Editor import :: Editor
-from iTasks.UI.Editor.Generic import generic gEditor
-from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat
-from iTasks.Internal.Generic.Defaults import generic gDefault
-from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
-from Data.GenEq import generic gEq
-from Data.Maybe import :: Maybe
-
 /**
 * Reads shared data once.
 *
diff --git a/Libraries/iTasks/WF/Tasks/SDS.icl b/Libraries/iTasks/WF/Tasks/SDS.icl
index 2b7a3ca5ca69cacbdbc243f96c911bbe72d50cf7..fd863070cb79168312a63484d73ad6f7916ec912 100644
--- a/Libraries/iTasks/WF/Tasks/SDS.icl
+++ b/Libraries/iTasks/WF/Tasks/SDS.icl
@@ -4,13 +4,11 @@ import StdEnv
 
 import iTasks.SDS.Definition
 import iTasks.WF.Tasks.Core
-import iTasks.WF.Definition
 import iTasks.UI.Definition
 
 import iTasks.Internal.AsyncSDS
 import iTasks.Internal.Task
 import iTasks.Internal.TaskEval
-import iTasks.Internal.TaskState
 import iTasks.Internal.Util
 
 get :: !(sds () a w) -> Task a | TC a & Readable sds & TC w