deleted more uneeded code
Merge branch 'hotfix/1.0.4'
Merge branch 'hotfix/1.0.4' into develop
Merge branch 'develop'