Merge branch 'js/remove-unused-variables'