Fix bugs
Remove unused line
Merge branch 'develop'