remove the unused code
Merge branch 'develop'