updated user model, getting rid of messenger etc