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