Merge branch 'refactor/remove-js'