Remove duplicated api methods
Merge branch 'master' into ui-revolution