Remove unnecessary (and commented-out) code.