Merge branch 'hotfix/1.0.1'
Removed unused JS
Merge branch 'hotfix/1.0.2' into develop