UC-21 Update wfMsg calls
UC-21 Remove commented out code