#85: removed unused code and cleaned up test code on both c++ & c# sides