"use strict;" cleanup (2)