Remove references to $user_info