Also some related cleanup (removal of wfProfile* stuff, etc.). Change-Id: Id8a993e71ddca7bfbf3452725300167698ce3135