Get rid of an unnecessary loop...