fix #237.
Merge pull request #273 from eggrobin/cleanup-cs

C# Cleanup