Remove CSharp stuff and some fixes