CSharp API Clean-up.