remove usless helper
Merge branch 'develop'