More cleanups to the cut_commercials method