Deleted Userinfo class & screen + update in func