REmove unused function
Merge branch 'master' into apiv1