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

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