Removed unnecessary lines
Merge branch 'develop'