removed some unneeded code
Merge branch 'develop'