Remove commented code from js
Merge branch 'dev'