Removed unnecessary code
Merge pull request #1674 from fruitwasp/master

Removed unnecessary code
Fixed #1676
Merge branch 'master' into workshop