Refactor API (closes #4110 #4109)

+ Delete unused API (closes #4110)
+ Refactor API name (closes #4109)