Removing out-of-date usage to prevent confusion
Fix merge conflict, re-include working API.