Remove some dead script code and fix a script comment.

Change-Id: I91ca466d1b6f8a39da50ce61acebc268d0daab3a
Merge "Remove some dead script code and fix a script comment." into jb42