More script cleanup.