diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs
index 5d0e24e63..0fc5f8f21 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs
@@ -1,16 +1,10 @@
-using BCG;
-using System;
-using System.Data;
-using System.Collections;
-using BCG.Utilities;
-using System.Text.RegularExpressions;
-
using Bts.DataStream;
-using mbts;
-using mbts.spark;
using mbts.config;
+using System;
+using System.Text.RegularExpressions;
+
namespace BCG.StreamWorld.Addition
{
[DataStreamUserRespresentation (false)]
diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs
index ecc72a4d1..4ce9eaa4e 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using bts;
-
+using bts;
using mbts;
-using mbts.spark;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs
index e0bd6467e..0a341413e 100644
--- a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinStream.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using bts;
-
+using bts;
using mbts;
-using mbts.spark;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
namespace BCG
{
diff --git a/src/DataStreamSuite/DataStream/Primitives/MongoDB/MongoDBStream.cs b/src/DataStreamSuite/DataStream/Primitives/MongoDB/MongoDBStream.cs
index d8854e353..43831d1ac 100644
--- a/src/DataStreamSuite/DataStream/Primitives/MongoDB/MongoDBStream.cs
+++ b/src/DataStreamSuite/DataStream/Primitives/MongoDB/MongoDBStream.cs
@@ -1,15 +1,13 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Driver;
-using MongoDB.Bson;
-using BCG;
using BCG.Utilities.General;
-using ZstdSharp.Unsafe;
-using System.Runtime.CompilerServices;
-using mbts.spark;
-using System.Diagnostics;
+
using bts;
+using MongoDB.Bson;
+using MongoDB.Driver;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
namespace BCG {
[DataStreamUserRespresentation("mongodb_sql")]
diff --git a/src/DataStreamSuite/DataStreamCore/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs
index 071b8b834..63f5e9dd6 100644
--- a/src/DataStreamSuite/DataStreamCore/DataStream.cs
+++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs
@@ -1,15 +1,12 @@
+using bts;
+
using Bts.DataStream;
+using mbts.config;
+
using System;
using System.Collections;
-
-//using BCG.Utilities;
-//using BCG.Utilities.General;
-using mbts;
-using mbts.config;
-using mbts.spark;
using System.Diagnostics;
-using bts;
namespace BCG
{
diff --git a/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs b/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs
index eefd545a8..52ef07ee9 100644
--- a/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs
+++ b/src/DataStreamSuite/PubSub/Misc/MasterWorker.cs
@@ -1,13 +1,12 @@
+using BCG.Utilities.General;
+
+using bts;
+
+using mbts;
+
using System;
using System.Collections.Generic;
-using System.Text;
-using BCG.Utilities.General;
-using System.Threading;
-using mbts;
-using mbts.spark;
using System.Diagnostics;
-using bts;
-//using BCG.Utilities;
namespace BCG
{
diff --git a/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs b/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs
index f832b7ba9..1d5d919ef 100644
--- a/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs
+++ b/src/DataStreamSuite/PubSub/SingleServerSubscriberCore.cs
@@ -1,14 +1,10 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Text;
-using BCG.Utilities;
-using BCG.Utilities.General;
-using mbts;
-using mbts.spark;
-using System.Linq;
using bts;
+using System;
+
+using System.Collections.Generic;
+using System.Linq;
+
namespace BCG {
///
/// Deals with the subscriptions (and getting data) from one single
@@ -17,9 +13,8 @@ namespace BCG {
/// will open its new dedicated connection to the serverURL that
/// its concerned with (passed as a conctructor arg).
///
-
internal interface ISingleServerSubscriberCore : IDisposable {
- IEnumerable get_updates(TimeSpan timeout);
+ IEnumerable get_updates(TimeSpan timeout);
event PubSubConnectionChange onPubSubConnectionChange;
void subscribe(params string[] tags);
void unsubscribe(params string[] tags);