More CSharp removal and fix