Script cleanup per Raffy.