Cleanup userData refs

Need to get at all the info passed in, not just the
limited fields.  Rename userData > _userData.