removing dead method
Merge branch 'develop'