You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ju...@apache.org on 2015/02/13 18:57:22 UTC

[2/6] incubator-reef git commit: [REEF-157] Automated Refactorings

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/IConfigurationBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IConfigurationBuilder.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/IConfigurationBuilder.cs
index 0ba360f..f5ae58b 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IConfigurationBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IConfigurationBuilder.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,11 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Interface

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/ICsClassHierarchy.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/ICsClassHierarchy.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/ICsClassHierarchy.cs
index 72dcbf3..661f48e 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/ICsClassHierarchy.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/ICsClassHierarchy.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Interface

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/ICsConfigurationBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/ICsConfigurationBuilder.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/ICsConfigurationBuilder.cs
index 49787c6..e553995 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/ICsConfigurationBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/ICsConfigurationBuilder.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Util;

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
index dae4dc1..0df3ee7 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Interface
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/ITang.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/ITang.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/ITang.cs
index 7715c40..b9d8902 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/ITang.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/ITang.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 
 namespace Org.Apache.REEF.Tang.Interface

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
index 60893c4..45f3f5a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.csproj
@@ -44,10 +44,6 @@ under the License.
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -154,4 +150,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Tang/Properties/AssemblyInfo.cs
index ab3b0bb..5d202c1 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferClassHierarchy.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferClassHierarchy.cs b/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferClassHierarchy.cs
index e47fac7..07acd8f 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferClassHierarchy.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferClassHierarchy.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,18 +17,16 @@
  * under the License.
  */
 
-using System;
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Exceptions;
-using Org.Apache.REEF.Tang.Implementations;
+using Org.Apache.REEF.Tang.Implementations.ClassHierarchy;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 using ProtoBuf;
-using Org.Apache.REEF.Tang.Implementations.ClassHierarchy;
 
 namespace Org.Apache.REEF.Tang.Protobuf
 {
@@ -36,8 +34,8 @@ namespace Org.Apache.REEF.Tang.Protobuf
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(ProtocolBufferClassHierarchy));
 
-        private IPackageNode rootNode;
-        private IDictionary<string, INode> lookupTable = new Dictionary<string, INode>();
+        private readonly IPackageNode rootNode;
+        private readonly IDictionary<string, INode> lookupTable = new Dictionary<string, INode>();
 
         public static void Serialize(string fileName, IClassHierarchy classHierarchy)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/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 647faec..f82c4e2 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Protobuf/ProtocolBufferInjectionPlan.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
-using Org.Apache.REEF.Tang.Implementations;
+using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 using ProtoBuf;
-using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
 
 namespace Org.Apache.REEF.Tang.Protobuf
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Types/IClassNode.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Types/IClassNode.cs b/lang/cs/Org.Apache.REEF.Tang/Types/IClassNode.cs
index 478d2ab..5a018d3 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Types/IClassNode.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Types/IClassNode.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System.Collections.Generic;
+
+using System.Collections.Generic;
 
 namespace Org.Apache.REEF.Tang.Types
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Types/IConstructorDef.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Types/IConstructorDef.cs b/lang/cs/Org.Apache.REEF.Tang/Types/IConstructorDef.cs
index 606381f..25303d8 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Types/IConstructorDef.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Types/IConstructorDef.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 
 namespace Org.Apache.REEF.Tang.Types

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Types/INode.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Types/INode.cs b/lang/cs/Org.Apache.REEF.Tang/Types/INode.cs
index aade8bb..59b5c8a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Types/INode.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Types/INode.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Types
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Types/ITraversable.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Types/ITraversable.cs b/lang/cs/Org.Apache.REEF.Tang/Types/ITraversable.cs
index eed28e9..3f230d9 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Types/ITraversable.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Types/ITraversable.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System.Collections.Generic;
+
+using System.Collections.Generic;
 
 namespace Org.Apache.REEF.Tang.Types
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Util/AbstractMonotonicMultiMap.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Util/AbstractMonotonicMultiMap.cs b/lang/cs/Org.Apache.REEF.Tang/Util/AbstractMonotonicMultiMap.cs
index 22cb4a6..0a525eb 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/AbstractMonotonicMultiMap.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/AbstractMonotonicMultiMap.cs
@@ -31,7 +31,7 @@ namespace Org.Apache.REEF.Tang.Util
 
         private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
-        private IDictionary<K, ISet<V>> map;
+        private readonly IDictionary<K, ISet<V>> map;
 
         private int size = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/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 f5e30f9..18984dd 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/AssemblyLoader.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Org.Apache.REEF.Utilities.Logging;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Util
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicSet.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicSet.cs b/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicSet.cs
index e8831ff..14dcb00 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicSet.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicSet.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using Org.Apache.REEF.Utilities.Logging;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Util
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicTreeMap.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicTreeMap.cs b/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicTreeMap.cs
index 328dfb7..e19c631 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicTreeMap.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/MonotonicTreeMap.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.Threading;
-using Org.Apache.REEF.Utilities.Logging;
+using System.Threading;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Util
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Util/ReflectionUtilities.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Util/ReflectionUtilities.cs b/lang/cs/Org.Apache.REEF.Tang/Util/ReflectionUtilities.cs
index bd50e77..29bd754 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/ReflectionUtilities.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/ReflectionUtilities.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Exceptions;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Org.Apache.REEF.Tang.Annotations;
+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/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Util/SetValuedKey.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Util/SetValuedKey.cs b/lang/cs/Org.Apache.REEF.Tang/Util/SetValuedKey.cs
index 5d146cb..35580a8 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Util/SetValuedKey.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Util/SetValuedKey.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Evaluator/EvaluatorTests.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Evaluator/EvaluatorTests.cs b/lang/cs/Org.Apache.REEF.Tests/Evaluator/EvaluatorTests.cs
index 7256765..460f4d7 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Evaluator/EvaluatorTests.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Evaluator/EvaluatorTests.cs
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Avro;
-using Org.Apache.REEF.Common.Evaluator;
-using Org.Apache.REEF.Tang.Formats;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Org.Apache.REEF.Common.Avro;
+using Org.Apache.REEF.Common.Evaluator;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Examples.Tasks.ShellTask;
+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.Util;
 
 namespace Org.Apache.REEF.Tests.Evaluator
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs
index 8d00e69..982d799 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs
@@ -40,7 +40,7 @@ namespace Org.Apache.REEF.Tests.Functional.ML.KMeans
         private const string SmallMouseDataFile = @"mouseData_small.csv";
         private const string MouseDataFile = @"mouseData.csv";
 
-        private bool _useSmallDataSet = false;
+        private readonly bool _useSmallDataSet = false;
         private string _dataFile = MouseDataFile;
 
         [TestInitialize()]

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceDriver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceDriver.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceDriver.cs
index 7472d56..1719671 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/BroadcastReduceDriver.cs
@@ -46,12 +46,12 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.BroadcastReduceTest
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(BroadcastReduceDriver));
 
-        private int _numEvaluators;
-        private int _numIterations;
+        private readonly int _numEvaluators;
+        private readonly int _numIterations;
 
-        private IMpiDriver _mpiDriver;
-        private ICommunicationGroupDriver _commGroup;
-        private TaskStarter _mpiTaskStarter;
+        private readonly IMpiDriver _mpiDriver;
+        private readonly ICommunicationGroupDriver _commGroup;
+        private readonly TaskStarter _mpiTaskStarter;
 
         [Inject]
         public BroadcastReduceDriver(

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/MasterTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/MasterTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/MasterTask.cs
index 78f8840..fd3084d 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/MasterTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/MasterTask.cs
@@ -29,15 +29,15 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.BroadcastReduceTest
 {
     public class MasterTask : ITask
     {
-        private static Logger _logger = Logger.GetLogger(typeof(MasterTask));
+        private static readonly Logger _logger = Logger.GetLogger(typeof(MasterTask));
 
-        private int _numIters;
-        private int _numReduceSenders;
+        private readonly int _numIters;
+        private readonly int _numReduceSenders;
 
-        private IMpiClient _mpiClient;
-        private ICommunicationGroupClient _commGroup;
-        private IBroadcastSender<int> _broadcastSender;
-        private IReduceReceiver<int> _sumReducer;
+        private readonly IMpiClient _mpiClient;
+        private readonly ICommunicationGroupClient _commGroup;
+        private readonly IBroadcastSender<int> _broadcastSender;
+        private readonly IReduceReceiver<int> _sumReducer;
 
         [Inject]
         public MasterTask(

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/SlaveTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/SlaveTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/SlaveTask.cs
index 20b9351..08fbde4 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/SlaveTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/BroadcastReduceTest/SlaveTask.cs
@@ -28,13 +28,13 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.BroadcastReduceTest
 {
     public class SlaveTask : ITask
     {
-        private static Logger _logger = Logger.GetLogger(typeof(SlaveTask));
+        private static readonly Logger _logger = Logger.GetLogger(typeof(SlaveTask));
 
-        private int _numIterations;
-        private IMpiClient _mpiClient;
-        private ICommunicationGroupClient _commGroup;
-        private IBroadcastReceiver<int> _broadcastReceiver;
-        private IReduceSender<int> _triangleNumberSender;
+        private readonly int _numIterations;
+        private readonly IMpiClient _mpiClient;
+        private readonly ICommunicationGroupClient _commGroup;
+        private readonly IBroadcastReceiver<int> _broadcastReceiver;
+        private readonly IReduceSender<int> _triangleNumberSender;
 
         [Inject]
         public SlaveTask(

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/MasterTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/MasterTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/MasterTask.cs
index 07168c2..8697911 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/MasterTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/MasterTask.cs
@@ -29,12 +29,12 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.ScatterReduceTest
 {
     public class MasterTask : ITask
     {
-        private static Logger _logger = Logger.GetLogger(typeof(MasterTask));
+        private static readonly Logger _logger = Logger.GetLogger(typeof(MasterTask));
 
-        private IMpiClient _mpiClient;
-        private ICommunicationGroupClient _commGroup;
-        private IScatterSender<int> _scatterSender;
-        private IReduceReceiver<int> _sumReducer;
+        private readonly IMpiClient _mpiClient;
+        private readonly ICommunicationGroupClient _commGroup;
+        private readonly IScatterSender<int> _scatterSender;
+        private readonly IReduceReceiver<int> _sumReducer;
 
         [Inject]
         public MasterTask(IMpiClient mpiClient)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceDriver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceDriver.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceDriver.cs
index 18ff22b..81cf745 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/ScatterReduceDriver.cs
@@ -44,11 +44,11 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.ScatterReduceTest
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(ScatterReduceDriver));
 
-        private int _numEvaluators;
+        private readonly int _numEvaluators;
 
-        private IMpiDriver _mpiDriver;
-        private ICommunicationGroupDriver _commGroup;
-        private TaskStarter _mpiTaskStarter;
+        private readonly IMpiDriver _mpiDriver;
+        private readonly ICommunicationGroupDriver _commGroup;
+        private readonly TaskStarter _mpiTaskStarter;
 
         [Inject]
         public ScatterReduceDriver(

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/SlaveTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/SlaveTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/SlaveTask.cs
index 327b991..6c43280 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/SlaveTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/MPI/ScatterReduceTest/SlaveTask.cs
@@ -29,12 +29,12 @@ namespace Org.Apache.REEF.Tests.Functional.MPI.ScatterReduceTest
 {
     public class SlaveTask : ITask
     {
-        private static Logger _logger = Logger.GetLogger(typeof(SlaveTask));
+        private static readonly Logger _logger = Logger.GetLogger(typeof(SlaveTask));
 
-        private IMpiClient _mpiClient;
-        private ICommunicationGroupClient _commGroup;
-        private IScatterReceiver<int> _scatterReceiver;
-        private IReduceSender<int> _sumSender;
+        private readonly IMpiClient _mpiClient;
+        private readonly ICommunicationGroupClient _commGroup;
+        private readonly IScatterReceiver<int> _scatterReceiver;
+        private readonly IReduceSender<int> _sumSender;
 
         [Inject]
         public SlaveTask(IMpiClient mpiClient)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
index fb460a5..885319a 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
@@ -81,7 +81,7 @@ namespace Org.Apache.REEF.Tests.Functional.Messaging
 
         public class MessagingDriverMessageHandler : IDriverMessageHandler
         {
-            private MessageTask _parentTask;
+            private readonly MessageTask _parentTask;
 
             [Inject]
             public MessagingDriverMessageHandler(MessageTask task)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
index 2fe444b..582ad26 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
@@ -49,13 +49,13 @@ namespace Org.Apache.REEF.Tests.Functional
 
         private bool _testSuccess = false;
         private bool _onLocalRuntime = false;
-        private string _className = Constants.BridgeLaunchClass;
-        private string _clrFolder = ".";
-        private string _reefJar = Path.Combine(_binFolder, Constants.BridgeJarFileName);
-        private string _runCommand = Path.Combine(_binFolder, _cmdFile);
+        private readonly string _className = Constants.BridgeLaunchClass;
+        private readonly string _clrFolder = ".";
+        private readonly string _reefJar = Path.Combine(_binFolder, Constants.BridgeJarFileName);
+        private readonly string _runCommand = Path.Combine(_binFolder, _cmdFile);
 
         // TODO: once things stablize, we would like to toggle this to be false and only enable when needed for debugging test failures.
-        private bool _enableRealtimeLogUpload = true; 
+        private readonly bool _enableRealtimeLogUpload = true; 
 
         protected string TestId { get; set; }
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Network/NetworkServiceTests.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Network/NetworkServiceTests.cs b/lang/cs/Org.Apache.REEF.Tests/Network/NetworkServiceTests.cs
index 2926cf7..2427a05 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Network/NetworkServiceTests.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Network/NetworkServiceTests.cs
@@ -152,7 +152,7 @@ namespace Org.Apache.REEF.Tests.Network
 
         private class MessageHandler : IObserver<NsMessage<string>>
         {
-            private BlockingCollection<string> _queue;
+            private readonly BlockingCollection<string> _queue;
 
             public MessageHandler(BlockingCollection<string> queue)
             {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj
index 239b5da..cbbdd35 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj
@@ -35,51 +35,15 @@ under the License.
     <BuildPackage>false</BuildPackage>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Data.Edm, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(PackagesDir)\Microsoft.Data.Edm.5.6.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Data.OData, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(PackagesDir)\Microsoft.Data.OData.5.6.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Data.Services.Client, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.6.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Hadoop.Avro">
-      <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.WindowsAzure.Configuration">
-      <HintPath>$(PackagesDir)\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
       <HintPath>$(PackagesDir)\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="protobuf-net">
-      <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core">
-      <HintPath>$(PackagesDir)\Rx-Core.$(RxVersion)\lib\net45\System.Reactive.Core.dll</HintPath>
-    </Reference>
     <Reference Include="System.Reactive.Interfaces">
       <HintPath>$(PackagesDir)\Rx-Interfaces.$(RxVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Spatial, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(PackagesDir)\System.Spatial.5.6.3\lib\net40\System.Spatial.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Evaluator\EvaluatorConfigurationsTests.cs" />
@@ -121,10 +85,6 @@ under the License.
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Client\Org.Apache.REEF.Client.csproj">
-      <Project>{5094c35b-4fdb-4322-ac05-45d684501cbf}</Project>
-      <Name>Org.Apache.REEF.Client</Name>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj">
       <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project>
       <Name>Org.Apache.REEF.Common</Name>
@@ -133,10 +93,6 @@ under the License.
       <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project>
       <Name>Org.Apache.REEF.Driver</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.csproj">
-      <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project>
-      <Name>Org.Apache.REEF.Evaluator</Name>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.csproj">
       <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project>
       <Name>Org.Apache.REEF.Examples</Name>
@@ -179,4 +135,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Tests/Properties/AssemblyInfo.cs
index ab783f0..61f8d50 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Utilities/AvroUtils.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/AvroUtils.cs b/lang/cs/Org.Apache.REEF.Utilities/AvroUtils.cs
index 7a92b49..b131c1f 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/AvroUtils.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/AvroUtils.cs
@@ -17,12 +17,7 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Hadoop.Avro;
 
 namespace Org.Apache.REEF.Utilities

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/DiagnosticsMessages.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/DiagnosticsMessages.cs b/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/DiagnosticsMessages.cs
index 165c54c..8c54b4b 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/DiagnosticsMessages.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/DiagnosticsMessages.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Utilities.Diagnostics
 {
     public class DiagnosticsMessages

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/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 035fdbe..e957e83 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/Diagnostics/Exceptions.cs
@@ -18,7 +18,6 @@
  */
 
 using System;
-using System.Globalization;
 using System.Text;
 using Org.Apache.REEF.Utilities.Logging;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs b/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs
index 3de6e22..624ad36 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/Logging/Logger.cs
@@ -53,9 +53,9 @@ namespace Org.Apache.REEF.Utilities.Logging
 
         private static List<TraceListener> _traceListeners;
 
-        private string _name;       
+        private readonly string _name;       
 
-        private TraceSource _traceSource;
+        private readonly TraceSource _traceSource;
 
         private Logger(string name)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs b/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs
index 7c9a92c..c8e3f55 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/NetUtilities.cs
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
 using System;
 using System.Net;
+using Org.Apache.REEF.Utilities.Diagnostics;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Utilities
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj
index 81805b6..fa4ff66 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj
+++ b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.Reef.Utilities.csproj
@@ -35,16 +35,8 @@ under the License.
     <Reference Include="Microsoft.Hadoop.Avro">
       <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AvroUtils.cs" />
@@ -73,4 +65,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Utilities/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Utilities/Properties/AssemblyInfo.cs
index 5401a32..768499c 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Utilities/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs b/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs
index c894c00..1e97c1b 100644
--- a/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs
+++ b/lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs
@@ -26,10 +26,8 @@ using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Wake.Time;
 using Org.Apache.REEF.Wake.Time.Event;
 using Org.Apache.REEF.Wake.Time.Runtime;
-using Org.Apache.REEF.Wake.Time.Runtime.Event;
 
 namespace Org.Apache.REEF.Wake.Tests
 {
@@ -148,7 +146,7 @@ namespace Org.Apache.REEF.Wake.Tests
 
         private class HeartbeatObserver : IObserver<Alarm>
         {
-            private RuntimeClock _clock;
+            private readonly RuntimeClock _clock;
 
             public HeartbeatObserver(RuntimeClock clock)
             {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj
index 1f83efe..8563a08 100644
--- a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj
@@ -44,11 +44,6 @@ under the License.
     <Reference Include="System.Reactive.Interfaces">
       <HintPath>$(PackagesDir)\Rx-Interfaces.$(RxVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClockTest.cs" />
@@ -63,10 +58,6 @@ under the License.
       <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
       <Name>Org.Apache.REEF.Tang</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
-      <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
-      <Name>Org.Apache.REEF.Utilities</Name>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
       <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
       <Name>Org.Apache.REEF.Wake</Name>
@@ -87,4 +78,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs
index 47e58c2..f63e820 100644
--- a/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/IIdentifier.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/IIdentifier.cs b/lang/cs/Org.Apache.REEF.Wake/IIdentifier.cs
index 3ccaf1f..66dd5bc 100644
--- a/lang/cs/Org.Apache.REEF.Wake/IIdentifier.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/IIdentifier.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Wake
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/IIdentifierFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/IIdentifierFactory.cs b/lang/cs/Org.Apache.REEF.Wake/IIdentifierFactory.cs
index 9e781f3..df6b901 100644
--- a/lang/cs/Org.Apache.REEF.Wake/IIdentifierFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/IIdentifierFactory.cs
@@ -19,11 +19,6 @@
 
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Wake.Remote.Impl;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Wake
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/IObserverFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/IObserverFactory.cs b/lang/cs/Org.Apache.REEF.Wake/IObserverFactory.cs
index d43e4b3..0ee9f72 100644
--- a/lang/cs/Org.Apache.REEF.Wake/IObserverFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/IObserverFactory.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Wake
 {
     public interface IObserverFactory

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Impl/LoggingEventHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Impl/LoggingEventHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Impl/LoggingEventHandler.cs
index cd2bff5..ef74db6 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Impl/LoggingEventHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Impl/LoggingEventHandler.cs
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Wake.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Impl/MissingStartHandlerHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Impl/MissingStartHandlerHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Impl/MissingStartHandlerHandler.cs
index e44f335..57416e5 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Impl/MissingStartHandlerHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Impl/MissingStartHandlerHandler.cs
@@ -19,7 +19,6 @@
 
 using System;
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Wake.Time;
 using Org.Apache.REEF.Wake.Time.Event;
 
 namespace Org.Apache.REEF.Wake.Impl

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Impl/PubSubEventHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Impl/PubSubEventHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Impl/PubSubEventHandler.cs
index 38a36be..29b7c87 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Impl/PubSubEventHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Impl/PubSubEventHandler.cs
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
+
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -32,7 +32,7 @@ namespace Org.Apache.REEF.Wake.Impl
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(PubSubEventHandler<T>));
 
-        private Dictionary<Type, List<object>> _classToHandlersMap;
+        private readonly Dictionary<Type, List<object>> _classToHandlersMap;
 
         /// <summary>
         /// Construct a pub-sub event handler

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Impl/SyncStage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Impl/SyncStage.cs b/lang/cs/Org.Apache.REEF.Wake/Impl/SyncStage.cs
index c6a7b22..6db7916 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Impl/SyncStage.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Impl/SyncStage.cs
@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
-using Org.Apache.REEF.Wake;
 
 namespace Org.Apache.REEF.Wake.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Impl/ThreadPoolStage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Impl/ThreadPoolStage.cs b/lang/cs/Org.Apache.REEF.Wake/Impl/ThreadPoolStage.cs
index f1bb67d..fa0f921 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Impl/ThreadPoolStage.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Impl/ThreadPoolStage.cs
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-using System.Threading;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Wake;
 using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Impl

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Impl/TimerStage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Impl/TimerStage.cs b/lang/cs/Org.Apache.REEF.Wake/Impl/TimerStage.cs
index f2f2f35..3102f66 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Impl/TimerStage.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Impl/TimerStage.cs
@@ -19,8 +19,6 @@
 
 using System.Timers;
 
-using Org.Apache.REEF.Wake;
-
 namespace Org.Apache.REEF.Wake.Impl
 {
     /// <summary>Stage that triggers an event handler periodically</summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
index 3d7d11d..6652730 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
+++ b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj
@@ -37,17 +37,9 @@ under the License.
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core">
-      <HintPath>$(PackagesDir)\Rx-Core.$(RxVersion)\lib\net45\System.Reactive.Core.dll</HintPath>
-    </Reference>
     <Reference Include="System.Reactive.Interfaces">
       <HintPath>$(PackagesDir)\Rx-Interfaces.$(RxVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -175,4 +167,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs
index 48a4764..ec54945 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/AbstractObserver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/AbstractObserver.cs b/lang/cs/Org.Apache.REEF.Wake/RX/AbstractObserver.cs
index 3c3451b..315f6c8 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/AbstractObserver.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/AbstractObserver.cs
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Logging;
 using System;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Wake.RX
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/IStaticObservable.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/IStaticObservable.cs b/lang/cs/Org.Apache.REEF.Wake/RX/IStaticObservable.cs
index 035953c..cf77e74 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/IStaticObservable.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/IStaticObservable.cs
@@ -17,11 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Org.Apache.REEF.Wake.RX
 {
     public interface IStaticObservable

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/Impl/PubSubSubject.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/PubSubSubject.cs b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/PubSubSubject.cs
index 73962dd..0f0f663 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/PubSubSubject.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/PubSubSubject.cs
@@ -19,10 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Subjects;
 using System.Reflection;
-using System.Text;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 
@@ -39,9 +36,9 @@ namespace Org.Apache.REEF.Wake.RX.Impl
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(PubSubSubject<T>));
 
-        private Dictionary<Type, List<object>> _classToObserversMap;
+        private readonly Dictionary<Type, List<object>> _classToObserversMap;
         private bool _completed;
-        private object _mutex;
+        private readonly object _mutex;
 
         /// <summary>
         /// Constructs a pub-sub Subject
@@ -139,9 +136,9 @@ namespace Org.Apache.REEF.Wake.RX.Impl
         /// </summary>
         private class DisposableResource<U> : IDisposable
         {
-            private Dictionary<Type, List<object>> _observersMap;
-            private IObserver<U> _observer;
-            private object _mutex;
+            private readonly Dictionary<Type, List<object>> _observersMap;
+            private readonly IObserver<U> _observer;
+            private readonly object _mutex;
             private bool _disposed;
             
             public DisposableResource(Dictionary<Type, List<object>> observersMap, IObserver<U> observer, object mutex)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxSyncStage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxSyncStage.cs b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxSyncStage.cs
index e2527a0..26d48c1 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxSyncStage.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxSyncStage.cs
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
+
 using System;
 
 namespace Org.Apache.REEF.Wake.RX.Impl

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxThreadPoolStage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxThreadPoolStage.cs b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxThreadPoolStage.cs
index d329430..a10d333 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxThreadPoolStage.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxThreadPoolStage.cs
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.Util;
-using System;
 
 namespace Org.Apache.REEF.Wake.RX.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxTimerStage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxTimerStage.cs b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxTimerStage.cs
index 541c2d4..7389ded 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxTimerStage.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/RxTimerStage.cs
@@ -19,7 +19,6 @@
 
 using System;
 using System.Timers;
-
 using Org.Apache.REEF.Wake.Impl;
 
 namespace Org.Apache.REEF.Wake.RX.Impl

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/RX/Impl/SimpleSubject.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/SimpleSubject.cs b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/SimpleSubject.cs
index 7d4aaa8..b6b633c 100644
--- a/lang/cs/Org.Apache.REEF.Wake/RX/Impl/SimpleSubject.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/RX/Impl/SimpleSubject.cs
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
+
 using System;
 
 namespace Org.Apache.REEF.Wake.RX.Impl

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/ICodecFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/ICodecFactory.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/ICodecFactory.cs
index 68b656a..0eb6bd6 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/ICodecFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/ICodecFactory.cs
@@ -19,11 +19,6 @@
 
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Wake.Remote.Impl;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Wake.Remote
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/ILink.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/ILink.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/ILink.cs
index c0ce1a2..71ffb69 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/ILink.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/ILink.cs
@@ -18,14 +18,9 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Org.Apache.REEF.Wake.Remote.Impl;
 
 namespace Org.Apache.REEF.Wake.Remote
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteEvent.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteEvent.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteEvent.cs
index d01e43e..de3b747 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteEvent.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IRemoteEvent.cs
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
 
 namespace Org.Apache.REEF.Wake.Remote
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ByteCodecFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ByteCodecFactory.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ByteCodecFactory.cs
index f6dbca3..8e33bdb 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ByteCodecFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ByteCodecFactory.cs
@@ -18,11 +18,6 @@
  */
 
 using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Channel.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Channel.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Channel.cs
index a1d78a3..dea6233 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Channel.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Channel.cs
@@ -18,10 +18,7 @@
  */
 
 using System;
-using System.IO;
-using System.Linq;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -32,7 +29,7 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     /// </summary>
     public class Channel
     {
-        private NetworkStream _stream;
+        private readonly NetworkStream _stream;
 
         /// <summary>
         /// Constructs a new Channel with the the connected NetworkStream.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/DefaultRemoteManager.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/DefaultRemoteManager.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/DefaultRemoteManager.cs
index cb9cf65..4f92a1f 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/DefaultRemoteManager.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/DefaultRemoteManager.cs
@@ -17,18 +17,11 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Wake.Util;
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
 using System.Net;
-using System.Net.Sockets;
-using System.Reactive;
-using System.Threading.Tasks;
+using Org.Apache.REEF.Utilities.Logging;
+using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {
@@ -39,10 +32,10 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(DefaultRemoteManager<T>));
 
-        private ObserverContainer<T> _observerContainer;
-        private TransportServer<IRemoteEvent<T>> _server; 
-        private Dictionary<IPEndPoint, ProxyObserver> _cachedClients;
-        private ICodec<IRemoteEvent<T>> _codec;
+        private readonly ObserverContainer<T> _observerContainer;
+        private readonly TransportServer<IRemoteEvent<T>> _server; 
+        private readonly Dictionary<IPEndPoint, ProxyObserver> _cachedClients;
+        private readonly ICodec<IRemoteEvent<T>> _codec;
 
         /// <summary>
         /// Constructs a DefaultRemoteManager listening on the specified address and any
@@ -286,7 +279,7 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
         /// </summary>
         private class ProxyObserver : IObserver<T>, IDisposable
         {
-            private TransportClient<IRemoteEvent<T>> _client;
+            private readonly TransportClient<IRemoteEvent<T>> _client;
             private int _messageCount;
 
             /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/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 80415c0..d2c5231 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IPEndpointComparer.cs
@@ -17,12 +17,8 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IntCodec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IntCodec.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IntCodec.cs
index ddbce2a..ab1bb0b 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IntCodec.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/IntCodec.cs
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Annotations;
 using System;
+using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Link.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Link.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Link.cs
index b4369e0..72619df 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Link.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/Link.cs
@@ -18,16 +18,13 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
@@ -39,9 +36,9 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(Link<T>));
 
-        private IPEndPoint _localEndpoint;
-        private ICodec<T> _codec;
-        private Channel _channel;
+        private readonly IPEndPoint _localEndpoint;
+        private readonly ICodec<T> _codec;
+        private readonly Channel _channel;
         private bool _disposed;
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiCodec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiCodec.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiCodec.cs
index 1d64f04..9d43170 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiCodec.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiCodec.cs
@@ -16,11 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
-using System;
-using System.Collections.Generic;
-using Org.Apache.REEF.Wake.Remote;
-using Org.Apache.REEF.Wake.Remote.Impl;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiDecoder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiDecoder.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiDecoder.cs
index c7db257..7dec8e1 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiDecoder.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiDecoder.cs
@@ -22,7 +22,6 @@ using System.Collections.Generic;
 using System.Reflection;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Remote.Proto;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
@@ -34,8 +33,8 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     public class MultiDecoder<T> : IDecoder<T>
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(MultiDecoder<T>));
-        private Dictionary<Type, object> _decoderMap;
-        private Dictionary<string, Type> _nameMap;
+        private readonly Dictionary<Type, object> _decoderMap;
+        private readonly Dictionary<string, Type> _nameMap;
 
         /// <summary>
         /// Constructs a decoder that decodes bytes based on the class type

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiEncoder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiEncoder.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiEncoder.cs
index ee9b0b2..2a75769 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiEncoder.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/MultiEncoder.cs
@@ -31,9 +31,9 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     /// </summary>
     public class MultiEncoder<T> : IEncoder<T>
     {
-        private static Logger _logger = Logger.GetLogger(typeof(MultiEncoder<>));
-        private Dictionary<Type, object> _encoderMap;
-        private Dictionary<Type, string> _nameMap;
+        private static readonly Logger _logger = Logger.GetLogger(typeof(MultiEncoder<>));
+        private readonly Dictionary<Type, object> _encoderMap;
+        private readonly Dictionary<Type, string> _nameMap;
 
         /// <summary>
         /// Constructs an encoder that encodes an object to bytes based on the class name

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ObserverContainer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ObserverContainer.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ObserverContainer.cs
index 725e9ce..d083dee 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ObserverContainer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/ObserverContainer.cs
@@ -19,14 +19,7 @@
 
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Wake.RX.Impl;
 using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
@@ -37,8 +30,8 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     /// </summary>
     internal class ObserverContainer<T> : IObserver<TransportEvent<IRemoteEvent<T>>>
     {
-        private ConcurrentDictionary<IPEndPoint, IObserver<T>> _endpointMap;
-        private ConcurrentDictionary<Type, IObserver<IRemoteMessage<T>>> _typeMap;
+        private readonly ConcurrentDictionary<IPEndPoint, IObserver<T>> _endpointMap;
+        private readonly ConcurrentDictionary<Type, IObserver<IRemoteMessage<T>>> _typeMap;
         private IObserver<T> _universalObserver;
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventDecoder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventDecoder.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventDecoder.cs
index 3fbea4d..683256c 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventDecoder.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventDecoder.cs
@@ -23,7 +23,7 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
 {
     public class RemoteEventDecoder<T> : IDecoder<IRemoteEvent<T>>
     {
-        private IDecoder<T> _decoder;
+        private readonly IDecoder<T> _decoder;
 
         public RemoteEventDecoder(IDecoder<T> decoder)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventEndpoint.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventEndpoint.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventEndpoint.cs
index 7d3e116..3005c22 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventEndpoint.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteEventEndpoint.cs
@@ -17,17 +17,11 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {
     public class RemoteEventEndPoint<T>
     {
-        private IRemoteIdentifier _id;
+        private readonly IRemoteIdentifier _id;
 
         public RemoteEventEndPoint(IRemoteIdentifier id)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/SocketRemoteIdentifier.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/SocketRemoteIdentifier.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/SocketRemoteIdentifier.cs
index ecb7711..6b19782 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/SocketRemoteIdentifier.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/SocketRemoteIdentifier.cs
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
 using System.Globalization;
 using System.Net;
 using System.Text;
+using Org.Apache.REEF.Utilities.Diagnostics;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {
@@ -31,7 +31,7 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     public class SocketRemoteIdentifier : IRemoteIdentifier
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(SocketRemoteIdentifier));
-        private IPEndPoint _addr;
+        private readonly IPEndPoint _addr;
 
         public SocketRemoteIdentifier(IPEndPoint addr)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringCodec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringCodec.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringCodec.cs
index f96caa7..ec67ebd 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringCodec.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringCodec.cs
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifier.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifier.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifier.cs
index 1e7243b..012647b 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifier.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifier.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {
     public class StringIdentifier : IIdentifier

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifierFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifierFactory.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifierFactory.cs
index 12657aa..dcf6ec8 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifierFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/StringIdentifierFactory.cs
@@ -18,11 +18,6 @@
  */
 
 using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs
index 85d6359..efcd428 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportClient.cs
@@ -29,9 +29,9 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     /// </summary>
     public class TransportClient<T> : IDisposable
     {
-        private ILink<T> _link;
-        private IObserver<TransportEvent<T>> _observer;
-        private CancellationTokenSource _cancellationSource;
+        private readonly ILink<T> _link;
+        private readonly IObserver<TransportEvent<T>> _observer;
+        private readonly CancellationTokenSource _cancellationSource;
         private bool _disposed;
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportEvent.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportEvent.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportEvent.cs
index 0e1eff7..950034c 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportEvent.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportEvent.cs
@@ -17,14 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Wake.Remote.Impl
 {
     public class TransportEvent<T>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/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 c953789..00ce09b 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/TransportServer.cs
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
 using System;
-using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
+using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.Util;
 
 namespace Org.Apache.REEF.Wake.Remote.Impl
@@ -36,10 +34,10 @@ namespace Org.Apache.REEF.Wake.Remote.Impl
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(TransportServer<>));
 
-        private TcpListener _listener;
-        private CancellationTokenSource _cancellationSource;
-        private IObserver<TransportEvent<T>> _remoteObserver;
-        private ICodec<T> _codec; 
+        private readonly TcpListener _listener;
+        private readonly CancellationTokenSource _cancellationSource;
+        private readonly IObserver<TransportEvent<T>> _remoteObserver;
+        private readonly ICodec<T> _codec; 
         private bool _disposed;
         private Task _serverTask;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Remote/RemoteConfiguration.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/RemoteConfiguration.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/RemoteConfiguration.cs
index 655155f..bc6c2b2 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/RemoteConfiguration.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/RemoteConfiguration.cs
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Annotations;
 using System;
+using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Wake.Remote
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Time/Event/Alarm.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Time/Event/Alarm.cs b/lang/cs/Org.Apache.REEF.Wake/Time/Event/Alarm.cs
index 1cc11f3..b249d78 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Time/Event/Alarm.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Time/Event/Alarm.cs
@@ -26,7 +26,7 @@ namespace Org.Apache.REEF.Wake.Time.Event
     /// </summary>
     public abstract class Alarm : Time
     {
-        private IObserver<Alarm> _handler;
+        private readonly IObserver<Alarm> _handler;
 
         public Alarm(long timestamp, IObserver<Alarm> handler) : base(timestamp)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Time/IClock.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Time/IClock.cs b/lang/cs/Org.Apache.REEF.Wake/Time/IClock.cs
index c4b0e14..55d46f9 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Time/IClock.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Time/IClock.cs
@@ -19,7 +19,6 @@
 
 using System;
 using System.Collections.Generic;
-
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Wake.Impl;
 using Org.Apache.REEF.Wake.Time.Event;

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/ClientAlarm.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/ClientAlarm.cs b/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/ClientAlarm.cs
index 76a3f82..569e421 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/ClientAlarm.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/ClientAlarm.cs
@@ -18,10 +18,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Wake.Time.Event;
 
 namespace Org.Apache.REEF.Wake.Time.Runtime.Event

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/RuntimeAlarm.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/RuntimeAlarm.cs b/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/RuntimeAlarm.cs
index 55cb202..aaffd32 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/RuntimeAlarm.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/Event/RuntimeAlarm.cs
@@ -18,10 +18,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Wake.Time.Event;
 
 namespace Org.Apache.REEF.Wake.Time.Runtime.Event

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/ITimer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/ITimer.cs b/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/ITimer.cs
index bfbbf05..5932c78 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/ITimer.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Time/Runtime/ITimer.cs
@@ -17,11 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Wake.Time.Runtime