Repository: reef
Updated Branches:
  refs/heads/master 59325a311 -> 6ef24d3e1


http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Network/Group/Pipelining/StreamingPipelineMessageCodec.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Network/Group/Pipelining/StreamingPipelineMessageCodec.cs
 
b/lang/cs/Org.Apache.REEF.Network/Group/Pipelining/StreamingPipelineMessageCodec.cs
index 48a653d..ae5d84f 100644
--- 
a/lang/cs/Org.Apache.REEF.Network/Group/Pipelining/StreamingPipelineMessageCodec.cs
+++ 
b/lang/cs/Org.Apache.REEF.Network/Group/Pipelining/StreamingPipelineMessageCodec.cs
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Wake.Remote;
 using System.Threading;
 using System.Threading.Tasks;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.StreamingCodec;
 
 namespace Org.Apache.REEF.Network.Group.Pipelining

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/GroupCommNetworkObserver.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/GroupCommNetworkObserver.cs 
b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/GroupCommNetworkObserver.cs
index d82ddd2..8aca802 100644
--- 
a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/GroupCommNetworkObserver.cs
+++ 
b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/GroupCommNetworkObserver.cs
@@ -24,7 +24,6 @@ using Org.Apache.REEF.Network.Group.Driver.Impl;
 using Org.Apache.REEF.Network.NetworkService;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
-using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Remote.Impl;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs 
b/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs
index bf606d6..fe6b819 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs
@@ -20,10 +20,10 @@ using System.Collections.Generic;
 using Org.Apache.REEF.Network.Group.Config;
 using Org.Apache.REEF.Network.Group.Operators;
 using Org.Apache.REEF.Network.Group.Operators.Impl;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
 
 namespace Org.Apache.REEF.Network.Group.Topology
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Network/Group/Topology/TreeTopology.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Topology/TreeTopology.cs 
b/lang/cs/Org.Apache.REEF.Network/Group/Topology/TreeTopology.cs
index 6358cf7..d7a73bd 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Topology/TreeTopology.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Topology/TreeTopology.cs
@@ -20,10 +20,10 @@ using System.Collections.Generic;
 using Org.Apache.REEF.Network.Group.Config;
 using Org.Apache.REEF.Network.Group.Operators;
 using Org.Apache.REEF.Network.Group.Operators.Impl;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
 
 namespace Org.Apache.REEF.Network.Group.Topology
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs 
b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs
index 55aba26..5864d7b 100644
--- a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs
@@ -20,8 +20,8 @@ using System.Linq;
 using Org.Apache.REEF.Common.Io;
 using Org.Apache.REEF.Network.Naming.Contracts;
 using Org.Apache.REEF.Network.Naming.Events;
-using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Network.Utilities;
+using Org.Apache.REEF.Wake.Remote;
 
 namespace Org.Apache.REEF.Network.Naming.Codec
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs 
b/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
index 96ffd34..af4df9e 100644
--- a/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs
@@ -30,7 +30,6 @@ using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Remote.Impl;
 using Org.Apache.REEF.Wake.RX;
 using Org.Apache.REEF.Wake.RX.Impl;
-using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Network.Naming
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs 
b/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs
index a0dd817..7892c5b 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Tang.Examples

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs 
b/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs
index e0465d7..6c27fe7 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Tang.Examples

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs 
b/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs
index 5a9de27..e311f82 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Tang.Examples

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs 
b/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs
index da6c6e0..8746f50 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Tang.Examples

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestNamedParameter.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestNamedParameter.cs 
b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestNamedParameter.cs
index 12f801f..8090814 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestNamedParameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestNamedParameter.cs
@@ -16,7 +16,6 @@
 // under the License.
 
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Protobuf;
 using Org.Apache.REEF.Tang.Types;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs 
b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs
index e344517..903ee80 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs
@@ -22,7 +22,6 @@ using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
 using Xunit;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
index cf059c0..1558c03 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using System.Collections.Generic;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchy.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchy.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchy.cs
index 32dda46..c18dbe4 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchy.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchy.cs
@@ -19,7 +19,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Runtime.Remoting.Messaging;
 using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract;
 using Org.Apache.REEF.Tang.Interface;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroClassNode.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroClassNode.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroClassNode.cs
index 8957751..d669044 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroClassNode.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroClassNode.cs
@@ -16,13 +16,12 @@
 // under the License.
 
 //<auto-generated />
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-    using Microsoft.Hadoop.Avro;
-
     /// <summary>
     /// Used to serialize and deserialize Avro record 
org.apache.reef.tang.implementation.avro.AvroClassNode.
     /// </summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorArg.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorArg.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorArg.cs
index af498cc..94f355f 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorArg.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorArg.cs
@@ -16,13 +16,11 @@
 // under the License.
 
 //<auto-generated />
+
+using System.Runtime.Serialization;
+
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-    using Microsoft.Hadoop.Avro;
-
     /// <summary>
     /// Used to serialize and deserialize Avro record 
org.apache.reef.tang.implementation.avro.AvroConstructorArg.
     /// </summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorDef.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorDef.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorDef.cs
index 6508f0c..e42f35a 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorDef.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroConstructorDef.cs
@@ -16,13 +16,12 @@
 // under the License.
 
 //<auto-generated />
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-    using Microsoft.Hadoop.Avro;
-
     /// <summary>
     /// Used to serialize and deserialize Avro record 
org.apache.reef.tang.implementation.avro.AvroConstructorDef.
     /// </summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNamedParameterNode.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNamedParameterNode.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNamedParameterNode.cs
index 59502f7..3169a6e 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNamedParameterNode.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNamedParameterNode.cs
@@ -16,13 +16,12 @@
 // under the License.
 
 //<auto-generated />
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-    using Microsoft.Hadoop.Avro;
-
     /// <summary>
     /// Used to serialize and deserialize Avro record 
org.apache.reef.tang.implementation.avro.AvroNamedParameterNode.
     /// </summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNode.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNode.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNode.cs
index dad2f91..10ca460 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNode.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroNode.cs
@@ -16,13 +16,13 @@
 // under the License.
 
 //<auto-generated />
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Microsoft.Hadoop.Avro;
+
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-    using Microsoft.Hadoop.Avro;
-
     /// <summary>
     /// Used to serialize and deserialize Avro record 
org.apache.reef.tang.implementation.avro.AvroNode.
     /// </summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroPackageNode.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroPackageNode.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroPackageNode.cs
index b426930..bf0c7c1 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroPackageNode.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroDataContract/AvroPackageNode.cs
@@ -16,13 +16,11 @@
 // under the License.
 
 //<auto-generated />
+
+using System.Runtime.Serialization;
+
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy.AvroDataContract
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-    using Microsoft.Hadoop.Avro;
-
     /// <summary>
     /// Used to serialize and deserialize Avro record 
org.apache.reef.tang.implementation.avro.AvroPackageNode.
     /// </summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
index 85d9dab..5278999 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using System.Collections.Generic;
 using System.Text;
 using Org.Apache.REEF.Tang.Exceptions;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
index 1cf794a..3cfb4d9 100644
--- 
a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs 
b/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
index f0aa7df..bb758b5 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
@@ -23,7 +23,6 @@ using Org.Apache.REEF.Tang.Implementations.ClassHierarchy;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
 using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.Tang

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs 
b/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
index a461afc..9e6b886 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-using System.Runtime.Remoting.Channels;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Interface

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs 
b/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
index d64bf7b..cb50d2a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using System.Collections.Generic;
 using Org.Apache.REEF.Tang.Types;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs 
b/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs
index 0f2f5fb..56a3e68 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Types/INamedParameterNode.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Types/INamedParameterNode.cs 
b/lang/cs/Org.Apache.REEF.Tang/Types/INamedParameterNode.cs
index 7462bc0..30eadb6 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Types/INamedParameterNode.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Types/INamedParameterNode.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Types

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs 
b/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs
index c6bb2e1..72b6235 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs
@@ -19,8 +19,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Util
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/HelloSimpleEventHandlers.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/HelloSimpleEventHandlers.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/HelloSimpleEventHandlers.cs
index 0944680..bdca8c2 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/HelloSimpleEventHandlers.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/HelloSimpleEventHandlers.cs
@@ -20,6 +20,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
 using System.Text;
+using Org.Apache.REEF.Common.Context;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Bridge;
@@ -32,8 +33,6 @@ using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Logging;
-using ContextConfiguration = 
Org.Apache.REEF.Common.Context.ContextConfiguration;
-using IRunningTask = Org.Apache.REEF.Driver.Task.IRunningTask;
 
 namespace Org.Apache.REEF.Tests.Functional.Bridge
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs
index cf75fd0..fb99f1c 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs
@@ -16,6 +16,7 @@
 // under the License.
 
 using System;
+using Org.Apache.REEF.Common.Context;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Context;
@@ -27,7 +28,6 @@ using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities.Logging;
-using ContextConfiguration = 
Org.Apache.REEF.Common.Context.ContextConfiguration;
 using Xunit;
 
 namespace Org.Apache.REEF.Tests.Functional.Bridge

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs
index 6b1e465..7d96273 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs
@@ -15,14 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-using System.IO;
-using System.Linq;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Driver.Defaults;
 using Org.Apache.REEF.Examples.AllHandlers;
-using Org.Apache.REEF.Examples.Tasks.HelloTask;
-using Org.Apache.REEF.Network.Naming;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs
index e0d835f..dbcff4f 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs
@@ -15,9 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System.Collections.Generic;
 using Org.Apache.REEF.Driver;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Driver.Defaults;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/SleepTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/SleepTask.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/SleepTask.cs
index eb5af2b..52efa78 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/SleepTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/SleepTask.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Threading;
 using Org.Apache.REEF.Common.Tasks;
+using Org.Apache.REEF.Common.Tasks.Events;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Common.Tasks.Events;
 
 namespace Org.Apache.REEF.Tests.Functional.Failure
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextDelayedPoison.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextDelayedPoison.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextDelayedPoison.cs
index 6496ce2..8d62eda 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextDelayedPoison.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextDelayedPoison.cs
@@ -16,19 +16,19 @@
 // under the License.
 
 using System;
+using Org.Apache.REEF.Common.Context;
+using Org.Apache.REEF.Common.Events;
+using Org.Apache.REEF.Common.Poison;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Common.Poison;
-using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Xunit;
-using Org.Apache.REEF.Common.Context;
-using Org.Apache.REEF.Common.Events;
 
 namespace Org.Apache.REEF.Tests.Functional.Failure
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextImmediatePoison.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextImmediatePoison.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextImmediatePoison.cs
index 9e3366f..116043d 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextImmediatePoison.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithActiveContextImmediatePoison.cs
@@ -16,19 +16,19 @@
 // under the License.
 
 using System;
+using Org.Apache.REEF.Common.Context;
+using Org.Apache.REEF.Common.Events;
+using Org.Apache.REEF.Common.Poison;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Common.Poison;
-using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Xunit;
-using Org.Apache.REEF.Common.Context;
-using Org.Apache.REEF.Common.Events;
 
 namespace Org.Apache.REEF.Tests.Functional.Failure
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithCompletedTaskDelayedPoison.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithCompletedTaskDelayedPoison.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithCompletedTaskDelayedPoison.cs
index c8f5927..1ae14ef 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithCompletedTaskDelayedPoison.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithCompletedTaskDelayedPoison.cs
@@ -16,20 +16,20 @@
 // under the License.
 
 using System;
+using Org.Apache.REEF.Common.Poison;
 using Org.Apache.REEF.Common.Tasks;
+using Org.Apache.REEF.Common.Tasks.Events;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Driver.Task;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Common.Poison;
-using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
-using Xunit;
-using Org.Apache.REEF.Common.Tasks.Events;
-using Org.Apache.REEF.Driver.Task;
 using Org.Apache.REEF.Utilities.Logging;
+using Xunit;
 
 namespace Org.Apache.REEF.Tests.Functional.Failure
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskDelayedPoison.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskDelayedPoison.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskDelayedPoison.cs
index d14df40..5a306da 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskDelayedPoison.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskDelayedPoison.cs
@@ -16,17 +16,17 @@
 // under the License.
 
 using System;
+using Org.Apache.REEF.Common.Poison;
 using Org.Apache.REEF.Common.Tasks;
+using Org.Apache.REEF.Common.Tasks.Events;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Common.Poison;
-using Org.Apache.REEF.Common.Tasks.Events;
-using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Xunit;
 
 namespace Org.Apache.REEF.Tests.Functional.Failure

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskImmediatePoison.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskImmediatePoison.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskImmediatePoison.cs
index 0b2b513..9faebbe 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskImmediatePoison.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/TestEvaluatorWithRunningTaskImmediatePoison.cs
@@ -16,17 +16,17 @@
 // under the License.
 
 using System;
+using Org.Apache.REEF.Common.Poison;
 using Org.Apache.REEF.Common.Tasks;
+using Org.Apache.REEF.Common.Tasks.Events;
 using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Common.Poison;
-using Org.Apache.REEF.Common.Tasks.Events;
-using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Xunit;
 
 namespace Org.Apache.REEF.Tests.Functional.Failure

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskCloseExceptionTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskCloseExceptionTest.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskCloseExceptionTest.cs
index 8571531..364c81b 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskCloseExceptionTest.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskCloseExceptionTest.cs
@@ -17,7 +17,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Common.Tasks.Events;
 using Org.Apache.REEF.Driver;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskStartExceptionTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskStartExceptionTest.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskStartExceptionTest.cs
index a218aef..f4cfafe 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskStartExceptionTest.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Failure/User/TaskStartExceptionTest.cs
@@ -18,7 +18,6 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
-using Org.Apache.REEF.Common.Context;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Common.Tasks.Events;
 using Org.Apache.REEF.Driver;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs
index e810702..9387f87 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs
@@ -17,11 +17,9 @@
 
 using System.Globalization;
 using Org.Apache.REEF.Driver;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Network.Examples.GroupCommunication;
 using 
Org.Apache.REEF.Network.Examples.GroupCommunication.BroadcastReduceDriverAndTasks;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Naming;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs
index a44b418..62694a4 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs
@@ -17,11 +17,9 @@
 
 using System.Globalization;
 using Org.Apache.REEF.Driver;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Network.Examples.GroupCommunication;
 using 
Org.Apache.REEF.Network.Examples.GroupCommunication.PipelineBroadcastReduceDriverAndTasks;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Naming;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs
index 30b371d..64bb3f1 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs
@@ -17,11 +17,9 @@
 
 using System.Globalization;
 using Org.Apache.REEF.Driver;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Network.Examples.GroupCommunication;
 using 
Org.Apache.REEF.Network.Examples.GroupCommunication.ScatterReduceDriverAndTasks;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Naming;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceTest.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceTest.cs
index 1b44663..d1841e8 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceTest.cs
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using Org.Apache.REEF.Utilities.Logging;
-using Xunit;
 using Org.Apache.REEF.Client.API;
 using Org.Apache.REEF.IMRU.Examples;
+using Org.Apache.REEF.Utilities.Logging;
+using Xunit;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceWithFilePartitionDataSetTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceWithFilePartitionDataSetTest.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceWithFilePartitionDataSetTest.cs
index 3bf712b..a7a067f 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceWithFilePartitionDataSetTest.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBroadcastReduceWithFilePartitionDataSetTest.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -36,7 +37,6 @@ using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 using Xunit;
-using TraceLevel = System.Diagnostics.TraceLevel;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceWithoutIMRUClientTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceWithoutIMRUClientTest.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceWithoutIMRUClientTest.cs
index eaa405f..46ac244 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceWithoutIMRUClientTest.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceWithoutIMRUClientTest.cs
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+using System.Diagnostics;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
 using Xunit;
-using TraceLevel = System.Diagnostics.TraceLevel;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
index 28d5bfb..433fce1 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Driver.Task;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
@@ -28,7 +29,6 @@ using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Logging;
 using Xunit;
-using TraceLevel = System.Diagnostics.TraceLevel;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUMapperCountTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUMapperCountTest.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUMapperCountTest.cs
index 3dad1fe..54ce76c 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUMapperCountTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUMapperCountTest.cs
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using Org.Apache.REEF.Utilities.Logging;
-using Xunit;
 using Org.Apache.REEF.Client.API;
 using Org.Apache.REEF.IMRU.Examples;
+using Org.Apache.REEF.Utilities.Logging;
+using Xunit;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluators.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluators.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluators.cs
index 5e53f5d..29c3e25 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluators.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluators.cs
@@ -15,11 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+using System.Diagnostics;
 using Org.Apache.REEF.IMRU.API;
 using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce;
-using TaskIdsToFail = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail;
-using FailureType = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType;
-using TestSenderMapFunction = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
 using Org.Apache.REEF.IMRU.OnREEF.Parameters;
 using Org.Apache.REEF.Network;
@@ -28,7 +26,6 @@ using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
 using Xunit;
-using TraceLevel = System.Diagnostics.TraceLevel;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {
@@ -134,13 +131,13 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
         {
             var c1 = IMRUMapConfiguration<int[], int[]>.ConfigurationModule
                 .Set(IMRUMapConfiguration<int[], int[]>.MapFunction,
-                    GenericType<TestSenderMapFunction>.Class)                  
 
+                    
GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class)
                   
                 .Build();
 
             var c2 = TangFactory.GetTang().NewConfigurationBuilder()
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-")
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-")
-                
.BindIntNamedParam<FailureType>(FailureType.EvaluatorFailureDuringTaskExecution.ToString())
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-2-")
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-3-")
+                
.BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskExecution.ToString())
                 .BindNamedParameter(typeof(MaxRetryNumberInRecovery), 
NumberOfRetry.ToString())
                 
.BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures),
 NumberOfRetry.ToString())
                 .Build();

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs
index c3e6657..d6c76be 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs
@@ -19,9 +19,6 @@ using Org.Apache.REEF.IMRU.API;
 using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
 using Org.Apache.REEF.IMRU.OnREEF.Parameters;
-using TaskIdsToFail = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail;
-using FailureType = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType;
-using TestSenderMapFunction = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
@@ -76,13 +73,13 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
         {
             var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule
                 .Set(IMRUMapConfiguration<int[], int[]>.MapFunction,
-                    GenericType<TestSenderMapFunction>.Class)                  
 
+                    
GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class)
                   
                 .Build();
 
             return TangFactory.GetTang().NewConfigurationBuilder(c)
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-")
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-")
-                
.BindIntNamedParam<FailureType>(FailureType.EvaluatorFailureDuringTaskDispose.ToString())
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-2-")
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-3-")
+                
.BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskDispose.ToString())
                 .BindNamedParameter(typeof(MaxRetryNumberInRecovery), 
NumberOfRetry.ToString())
                 
.BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures),
 NumberOfRetry.ToString())
                 .Build();

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs
 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs
index 5827e80..72f3103 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs
@@ -19,9 +19,6 @@ using Org.Apache.REEF.IMRU.API;
 using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
 using Org.Apache.REEF.IMRU.OnREEF.Parameters;
-using TaskIdsToFail = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail;
-using FailureType = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType;
-using TestSenderMapFunction = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
@@ -77,13 +74,13 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
         {
             var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule
                 .Set(IMRUMapConfiguration<int[], int[]>.MapFunction,
-                    GenericType<TestSenderMapFunction>.Class)                  
 
+                    
GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class)
                   
                 .Build();
 
             return TangFactory.GetTang().NewConfigurationBuilder(c)
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-")
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-")
-                
.BindIntNamedParam<FailureType>(FailureType.EvaluatorFailureDuringTaskInitialization.ToString())
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-2-")
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-3-")
+                
.BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskInitialization.ToString())
                 .BindNamedParameter(typeof(MaxRetryNumberInRecovery), 
NumberOfRetry.ToString())
                 
.BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures),
 NumberOfRetry.ToString())
                 .Build();

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs
index e5956a7..4faf66b 100644
--- 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs
+++ 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs
@@ -19,9 +19,6 @@ using Org.Apache.REEF.IMRU.API;
 using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
 using Org.Apache.REEF.IMRU.OnREEF.Parameters;
-using TaskIdsToFail = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail;
-using FailureType = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType;
-using TestSenderMapFunction = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
@@ -75,13 +72,13 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
         {
             var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule
                 .Set(IMRUMapConfiguration<int[], int[]>.MapFunction,
-                    GenericType<TestSenderMapFunction>.Class)                  
 
+                    
GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class)
                   
                 .Build();
 
             return TangFactory.GetTang().NewConfigurationBuilder(c)
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-")
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-")
-                
.BindIntNamedParam<FailureType>(FailureType.TaskFailureDuringTaskDispose.ToString())
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-2-")
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-3-")
+                
.BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.TaskFailureDuringTaskDispose.ToString())
                 .BindNamedParameter(typeof(MaxRetryNumberInRecovery), 
NumberOfRetry.ToString())
                 
.BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures),
 NumberOfRetry.ToString())
                 .Build();

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs
index 3e7f430..2851c3a 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs
@@ -18,9 +18,6 @@
 using Org.Apache.REEF.IMRU.API;
 using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
-using TaskIdsToFail = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail;
-using FailureType = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType;
-using TestSenderMapFunction = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction;
 using Org.Apache.REEF.IMRU.OnREEF.Parameters;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
@@ -80,13 +77,13 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
         {
             var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule
                 .Set(IMRUMapConfiguration<int[], int[]>.MapFunction,
-                    GenericType<TestSenderMapFunction>.Class)                  
 
+                    
GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class)
                   
                 .Build();
 
             return TangFactory.GetTang().NewConfigurationBuilder(c)
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-")
-                .BindSetEntry<TaskIdsToFail, 
string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-")
-                
.BindIntNamedParam<FailureType>(FailureType.TaskFailureDuringTaskInitialization.ToString())
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-2-")
+                
.BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, 
string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class,
 "IMRUMap-RandomInputPartition-3-")
+                
.BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.TaskFailureDuringTaskInitialization.ToString())
                 .BindNamedParameter(typeof(MaxRetryNumberInRecovery), 
NumberOfRetry.ToString())
                 
.BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures),
 NumberOfRetry.ToString())
                 .Build();

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs
index 3bd3ee0..1929c96 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs
@@ -16,10 +16,10 @@
 // under the License.
 
 using System;
+using System.Diagnostics;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.IMRU.API;
 using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce;
-using FailureType = 
Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Implementations.Tang;
@@ -28,7 +28,6 @@ using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 using Xunit;
-using TraceLevel = System.Diagnostics.TraceLevel;
 
 namespace Org.Apache.REEF.Tests.Functional.IMRU
 {
@@ -141,7 +140,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
                 .Build();
 
             return TangFactory.GetTang().NewConfigurationBuilder(c)
-                
.BindIntNamedParam<FailureType>(FailureType.EvaluatorFailureDuringTaskExecution.ToString())
+                
.BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskExecution.ToString())
                 .Build();
         }
 
@@ -161,7 +160,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
                 [Parameter(typeof(BroadcastReduceConfiguration.Dimensions))] 
int dim,
                 [Parameter(typeof(BroadcastReduceConfiguration.NumWorkers))] 
int numWorkers,
                 [Parameter(typeof(TaskConfigurationOptions.Identifier))] 
string taskId,
-                [Parameter(typeof(FailureType))] int failureType)
+                
[Parameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.FailureType))] int 
failureType)
             {
                 _maxIters = maxIters;
                 _iterations = 0;
@@ -171,7 +170,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
                 _taskId = taskId;
                 _failureType = failureType;
                 Logger.Log(Level.Info, "TestUpdateFunction: TaskId: {0}", 
_taskId);
-                Logger.Log(Level.Info, "Failure type: {0} failure", 
FailureType.IsEvaluatorFailure(_failureType) ? "evaluator" : "task");
+                Logger.Log(Level.Info, "Failure type: {0} failure", 
FaultTolerantPipelinedBroadcastAndReduce.FailureType.IsEvaluatorFailure(_failureType)
 ? "evaluator" : "task");
             }
 
             /// <summary>
@@ -222,9 +221,9 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU
                 if (_iterations == 10 && !_taskId.EndsWith("-" + 
NumberOfRetry))
                 { 
                     Logger.Log(Level.Warning, "Simulating {0} failure for 
taskId {1}",
-                        FailureType.IsEvaluatorFailure(_failureType) ? 
"evaluator" : "task",
+                        
FaultTolerantPipelinedBroadcastAndReduce.FailureType.IsEvaluatorFailure(_failureType)
 ? "evaluator" : "task",
                         _taskId);
-                    if (FailureType.IsEvaluatorFailure(_failureType))
+                    if 
(FaultTolerantPipelinedBroadcastAndReduce.FailureType.IsEvaluatorFailure(_failureType))
                     {
                         // simulate evaluator failure
                         Environment.Exit(1);

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
index 2f6aeaa..2562f61 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageDriver.cs
@@ -28,7 +28,6 @@ using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using IRunningTask = Org.Apache.REEF.Driver.Task.IRunningTask;
 
 namespace Org.Apache.REEF.Tests.Functional.Messaging
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTask.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTask.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTask.cs
index d0e38d0..2d4c206 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTask.cs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-using System.Threading;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities.Logging;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs 
b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs
index 94a05e9..43ca170 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs
@@ -16,18 +16,12 @@
 // under the License.
 
 using System;
-
 using Org.Apache.REEF.Driver;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Driver.Defaults;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Network.Naming;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Tests.Functional.Messaging;
 using Org.Apache.REEF.Utilities.Logging;
 using Xunit;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs 
b/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs
index 1099f06..f9e7402 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs
@@ -17,9 +17,9 @@
 
 using System;
 using System.IO;
-using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Client.Common;
 using Org.Apache.REEF.Common.Jar;
+using Org.Apache.REEF.Driver;
 using Xunit;
 
 namespace Org.Apache.REEF.Tests.Utility

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Tests/Utility/TestPriorityQueue.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Utility/TestPriorityQueue.cs 
b/lang/cs/Org.Apache.REEF.Tests/Utility/TestPriorityQueue.cs
index 36509f8..fcd6579 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Utility/TestPriorityQueue.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Utility/TestPriorityQueue.cs
@@ -20,7 +20,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Org.Apache.REEF.Utilities.Collections;
 using Xunit;
-using Assert = Xunit.Assert;
 
 namespace Org.Apache.REEF.Tests.Utility
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Utilities/AsyncUtils/LoggingHelper.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/AsyncUtils/LoggingHelper.cs 
b/lang/cs/Org.Apache.REEF.Utilities/AsyncUtils/LoggingHelper.cs
index 600ebf2..ad86c49 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/AsyncUtils/LoggingHelper.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/AsyncUtils/LoggingHelper.cs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
 using System.Threading.Tasks;
 using Org.Apache.REEF.Utilities.Logging;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs 
b/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs
index c5c5819..725a2d1 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs
@@ -17,8 +17,8 @@
 
 using System;
 using System.Runtime.ExceptionServices;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Utilities.Attributes;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Utilities.Diagnostics
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/HttpConfig.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/HttpConfig.cs 
b/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/HttpConfig.cs
index b935fd5..89b4640 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/HttpConfig.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/Runtime/Yarn/HttpConfig.cs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-
 namespace Org.Apache.REEF.Utilities.Runtime.Yarn
 {
     public static class HttpConfig

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake.Tests/RemoteManagerTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/RemoteManagerTest.cs 
b/lang/cs/Org.Apache.REEF.Wake.Tests/RemoteManagerTest.cs
index 90ad0bb..1ec9d76 100644
--- a/lang/cs/Org.Apache.REEF.Wake.Tests/RemoteManagerTest.cs
+++ b/lang/cs/Org.Apache.REEF.Wake.Tests/RemoteManagerTest.cs
@@ -22,7 +22,6 @@ using System.Reactive;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Remote.Impl;
-using Org.Apache.REEF.Wake.Util;
 using Xunit;
 
 namespace Org.Apache.REEF.Wake.Tests

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake.Tests/TransportTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/TransportTest.cs 
b/lang/cs/Org.Apache.REEF.Wake.Tests/TransportTest.cs
index 61ce0c6..a84ff2a 100644
--- a/lang/cs/Org.Apache.REEF.Wake.Tests/TransportTest.cs
+++ b/lang/cs/Org.Apache.REEF.Wake.Tests/TransportTest.cs
@@ -21,11 +21,9 @@ using System.Net;
 using System.Reactive;
 using System.Threading.Tasks;
 using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Remote.Impl;
 using Org.Apache.REEF.Wake.Remote.Parameters;
-using Org.Apache.REEF.Wake.Util;
 using Xunit;
 
 namespace Org.Apache.REEF.Wake.Tests

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/ICodec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/ICodec.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/ICodec.cs
index 14e8ddb..f7bec59 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/ICodec.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/ICodec.cs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-
 namespace Org.Apache.REEF.Wake.Remote
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/IDataReader.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IDataReader.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/IDataReader.cs
index ad31974..7dc7f0e 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IDataReader.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IDataReader.cs
@@ -15,10 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/IDataWriter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IDataWriter.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/IDataWriter.cs
index a4abdc3..f57cbcb 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IDataWriter.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IDataWriter.cs
@@ -15,10 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/IDecoder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IDecoder.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/IDecoder.cs
index ac5bf87..9b5b905 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IDecoder.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IDecoder.cs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-
 namespace Org.Apache.REEF.Wake.Remote
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/IEncoder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IEncoder.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/IEncoder.cs
index 49638f4..776a5bc 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IEncoder.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IEncoder.cs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-using System;
-
 namespace Org.Apache.REEF.Wake.Remote
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteObserver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteObserver.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteObserver.cs
index be2f565..b891436 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteObserver.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteObserver.cs
@@ -14,6 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
 using System;
 
 namespace Org.Apache.REEF.Wake.Remote

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs
index 69b9dcb..228ccc0 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs
@@ -14,6 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
 using System.Collections.Generic;
 using System.Net;
 

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs
index 05c259e..feea6fe 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportClient.cs
@@ -19,7 +19,6 @@ using System;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Org.Apache.REEF.Utilities.AsyncUtils;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.StreamingCodec;

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportServer.cs
----------------------------------------------------------------------
diff --git 
a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportServer.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportServer.cs
index 6a9ea1a..bf5ca73 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportServer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StreamingTransportServer.cs
@@ -24,7 +24,6 @@ using Org.Apache.REEF.Utilities.AsyncUtils;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.StreamingCodec;
-using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs
index ec2c4e2..85f0b7d 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs
@@ -23,7 +23,6 @@ using System.Threading.Tasks;
 using Org.Apache.REEF.Utilities.AsyncUtils;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/reef/blob/6ef24d3e/lang/cs/Org.Apache.REEF.Wake/Remote/TcpPortProvider.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/TcpPortProvider.cs 
b/lang/cs/Org.Apache.REEF.Wake/Remote/TcpPortProvider.cs
index 278b4be..d9d78dc 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/TcpPortProvider.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/TcpPortProvider.cs
@@ -18,9 +18,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.Remote.Parameters;
 
 namespace Org.Apache.REEF.Wake.Remote

Reply via email to