#98 Remove unused APIs
Merge branch 'enhancement98' into 0.2.0-update