am bd014c2e: Merge "Remove some dead script code and fix a script comment."

* commit 'bd014c2e4246d6e64a6523c73b9a72f379255526':
  Remove some dead script code and fix a script comment.