Merge pull request #372 from jtattermusch/csharp_cleanup

C# cleanup