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

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