Get rid of wfMsg* calls

Change-Id: I126968cc09a75bb72987a035e9435dab5e854a35