Removed unused JS
Merge branch 'hotfix/1.0.2'
Ugly hotfixes for new program