Merge branch 'remove-script-dep'