diff --git a/lib/models/phone/phone_model.dart b/lib/models/phone/phone_model.dart
index e9cd962..07bb853 100644
--- a/lib/models/phone/phone_model.dart
+++ b/lib/models/phone/phone_model.dart
@@ -9,7 +9,6 @@ abstract class PhoneModel implements _$PhoneModel {
   const PhoneModel._();
 
   const factory PhoneModel({
-    required String uid,
     required String model,
     required String imageUrl,
     required String soc,
diff --git a/lib/models/phone/phone_model.freezed.dart b/lib/models/phone/phone_model.freezed.dart
index ff18e61..364a84a 100644
--- a/lib/models/phone/phone_model.freezed.dart
+++ b/lib/models/phone/phone_model.freezed.dart
@@ -23,8 +23,7 @@ class _$PhoneModelTearOff {
   const _$PhoneModelTearOff();
 
   _PhoneModel call(
-      {required String uid,
-      required String model,
+      {required String model,
       required String imageUrl,
       required String soc,
       required int ram,
@@ -36,7 +35,6 @@ class _$PhoneModelTearOff {
       required int stock,
       required double sar}) {
     return _PhoneModel(
-      uid: uid,
       model: model,
       imageUrl: imageUrl,
       soc: soc,
@@ -61,7 +59,6 @@ const $PhoneModel = _$PhoneModelTearOff();
 
 /// @nodoc
 mixin _$PhoneModel {
-  String get uid => throw _privateConstructorUsedError;
   String get model => throw _privateConstructorUsedError;
   String get imageUrl => throw _privateConstructorUsedError;
   String get soc => throw _privateConstructorUsedError;
@@ -86,8 +83,7 @@ abstract class $PhoneModelCopyWith<$Res> {
           PhoneModel value, $Res Function(PhoneModel) then) =
       _$PhoneModelCopyWithImpl<$Res>;
   $Res call(
-      {String uid,
-      String model,
+      {String model,
       String imageUrl,
       String soc,
       int ram,
@@ -110,7 +106,6 @@ class _$PhoneModelCopyWithImpl<$Res> implements $PhoneModelCopyWith<$Res> {
 
   @override
   $Res call({
-    Object? uid = freezed,
     Object? model = freezed,
     Object? imageUrl = freezed,
     Object? soc = freezed,
@@ -124,10 +119,6 @@ class _$PhoneModelCopyWithImpl<$Res> implements $PhoneModelCopyWith<$Res> {
     Object? sar = freezed,
   }) {
     return _then(_value.copyWith(
-      uid: uid == freezed
-          ? _value.uid
-          : uid // ignore: cast_nullable_to_non_nullable
-              as String,
       model: model == freezed
           ? _value.model
           : model // ignore: cast_nullable_to_non_nullable
@@ -183,8 +174,7 @@ abstract class _$PhoneModelCopyWith<$Res> implements $PhoneModelCopyWith<$Res> {
       __$PhoneModelCopyWithImpl<$Res>;
   @override
   $Res call(
-      {String uid,
-      String model,
+      {String model,
       String imageUrl,
       String soc,
       int ram,
@@ -209,7 +199,6 @@ class __$PhoneModelCopyWithImpl<$Res> extends _$PhoneModelCopyWithImpl<$Res>
 
   @override
   $Res call({
-    Object? uid = freezed,
     Object? model = freezed,
     Object? imageUrl = freezed,
     Object? soc = freezed,
@@ -223,10 +212,6 @@ class __$PhoneModelCopyWithImpl<$Res> extends _$PhoneModelCopyWithImpl<$Res>
     Object? sar = freezed,
   }) {
     return _then(_PhoneModel(
-      uid: uid == freezed
-          ? _value.uid
-          : uid // ignore: cast_nullable_to_non_nullable
-              as String,
       model: model == freezed
           ? _value.model
           : model // ignore: cast_nullable_to_non_nullable
@@ -279,8 +264,7 @@ class __$PhoneModelCopyWithImpl<$Res> extends _$PhoneModelCopyWithImpl<$Res>
 @JsonSerializable()
 class _$_PhoneModel extends _PhoneModel {
   const _$_PhoneModel(
-      {required this.uid,
-      required this.model,
+      {required this.model,
       required this.imageUrl,
       required this.soc,
       required this.ram,
@@ -296,8 +280,6 @@ class _$_PhoneModel extends _PhoneModel {
   factory _$_PhoneModel.fromJson(Map<String, dynamic> json) =>
       _$$_PhoneModelFromJson(json);
 
-  @override
-  final String uid;
   @override
   final String model;
   @override
@@ -323,7 +305,7 @@ class _$_PhoneModel extends _PhoneModel {
 
   @override
   String toString() {
-    return 'PhoneModel(uid: $uid, model: $model, imageUrl: $imageUrl, soc: $soc, ram: $ram, storage: $storage, screenSize: $screenSize, battery: $battery, camera: $camera, price: $price, stock: $stock, sar: $sar)';
+    return 'PhoneModel(model: $model, imageUrl: $imageUrl, soc: $soc, ram: $ram, storage: $storage, screenSize: $screenSize, battery: $battery, camera: $camera, price: $price, stock: $stock, sar: $sar)';
   }
 
   @override
@@ -331,7 +313,6 @@ class _$_PhoneModel extends _PhoneModel {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _PhoneModel &&
-            const DeepCollectionEquality().equals(other.uid, uid) &&
             const DeepCollectionEquality().equals(other.model, model) &&
             const DeepCollectionEquality().equals(other.imageUrl, imageUrl) &&
             const DeepCollectionEquality().equals(other.soc, soc) &&
@@ -349,7 +330,6 @@ class _$_PhoneModel extends _PhoneModel {
   @override
   int get hashCode => Object.hash(
       runtimeType,
-      const DeepCollectionEquality().hash(uid),
       const DeepCollectionEquality().hash(model),
       const DeepCollectionEquality().hash(imageUrl),
       const DeepCollectionEquality().hash(soc),
@@ -375,8 +355,7 @@ class _$_PhoneModel extends _PhoneModel {
 
 abstract class _PhoneModel extends PhoneModel {
   const factory _PhoneModel(
-      {required String uid,
-      required String model,
+      {required String model,
       required String imageUrl,
       required String soc,
       required int ram,
@@ -392,8 +371,6 @@ abstract class _PhoneModel extends PhoneModel {
   factory _PhoneModel.fromJson(Map<String, dynamic> json) =
       _$_PhoneModel.fromJson;
 
-  @override
-  String get uid;
   @override
   String get model;
   @override
diff --git a/lib/models/phone/phone_model.g.dart b/lib/models/phone/phone_model.g.dart
index 1f88a4b..649d29a 100644
--- a/lib/models/phone/phone_model.g.dart
+++ b/lib/models/phone/phone_model.g.dart
@@ -8,7 +8,6 @@ part of 'phone_model.dart';
 
 _$_PhoneModel _$$_PhoneModelFromJson(Map<String, dynamic> json) =>
     _$_PhoneModel(
-      uid: json['uid'] as String,
       model: json['model'] as String,
       imageUrl: json['imageUrl'] as String,
       soc: json['soc'] as String,
@@ -24,7 +23,6 @@ _$_PhoneModel _$$_PhoneModelFromJson(Map<String, dynamic> json) =>
 
 Map<String, dynamic> _$$_PhoneModelToJson(_$_PhoneModel instance) =>
     <String, dynamic>{
-      'uid': instance.uid,
       'model': instance.model,
       'imageUrl': instance.imageUrl,
       'soc': instance.soc,
diff --git a/lib/models/user/user_model.dart b/lib/models/user/user_model.dart
index bdcd80f..8e3c1ff 100644
--- a/lib/models/user/user_model.dart
+++ b/lib/models/user/user_model.dart
@@ -9,7 +9,6 @@ abstract class UserModel implements _$UserModel {
   const UserModel._();
 
   const factory UserModel({
-    required String uid,
     required String firstName,
     required String lastName,
     required String email,
diff --git a/lib/models/user/user_model.freezed.dart b/lib/models/user/user_model.freezed.dart
index 6eee1ce..a0d3a64 100644
--- a/lib/models/user/user_model.freezed.dart
+++ b/lib/models/user/user_model.freezed.dart
@@ -23,8 +23,7 @@ class _$UserModelTearOff {
   const _$UserModelTearOff();
 
   _UserModel call(
-      {required String uid,
-      required String firstName,
+      {required String firstName,
       required String lastName,
       required String email,
       required String phoneNumber,
@@ -32,7 +31,6 @@ class _$UserModelTearOff {
       required int postalCode,
       required String city}) {
     return _UserModel(
-      uid: uid,
       firstName: firstName,
       lastName: lastName,
       email: email,
@@ -53,7 +51,6 @@ const $UserModel = _$UserModelTearOff();
 
 /// @nodoc
 mixin _$UserModel {
-  String get uid => throw _privateConstructorUsedError;
   String get firstName => throw _privateConstructorUsedError;
   String get lastName => throw _privateConstructorUsedError;
   String get email => throw _privateConstructorUsedError;
@@ -73,8 +70,7 @@ abstract class $UserModelCopyWith<$Res> {
   factory $UserModelCopyWith(UserModel value, $Res Function(UserModel) then) =
       _$UserModelCopyWithImpl<$Res>;
   $Res call(
-      {String uid,
-      String firstName,
+      {String firstName,
       String lastName,
       String email,
       String phoneNumber,
@@ -93,7 +89,6 @@ class _$UserModelCopyWithImpl<$Res> implements $UserModelCopyWith<$Res> {
 
   @override
   $Res call({
-    Object? uid = freezed,
     Object? firstName = freezed,
     Object? lastName = freezed,
     Object? email = freezed,
@@ -103,10 +98,6 @@ class _$UserModelCopyWithImpl<$Res> implements $UserModelCopyWith<$Res> {
     Object? city = freezed,
   }) {
     return _then(_value.copyWith(
-      uid: uid == freezed
-          ? _value.uid
-          : uid // ignore: cast_nullable_to_non_nullable
-              as String,
       firstName: firstName == freezed
           ? _value.firstName
           : firstName // ignore: cast_nullable_to_non_nullable
@@ -146,8 +137,7 @@ abstract class _$UserModelCopyWith<$Res> implements $UserModelCopyWith<$Res> {
       __$UserModelCopyWithImpl<$Res>;
   @override
   $Res call(
-      {String uid,
-      String firstName,
+      {String firstName,
       String lastName,
       String email,
       String phoneNumber,
@@ -167,7 +157,6 @@ class __$UserModelCopyWithImpl<$Res> extends _$UserModelCopyWithImpl<$Res>
 
   @override
   $Res call({
-    Object? uid = freezed,
     Object? firstName = freezed,
     Object? lastName = freezed,
     Object? email = freezed,
@@ -177,10 +166,6 @@ class __$UserModelCopyWithImpl<$Res> extends _$UserModelCopyWithImpl<$Res>
     Object? city = freezed,
   }) {
     return _then(_UserModel(
-      uid: uid == freezed
-          ? _value.uid
-          : uid // ignore: cast_nullable_to_non_nullable
-              as String,
       firstName: firstName == freezed
           ? _value.firstName
           : firstName // ignore: cast_nullable_to_non_nullable
@@ -217,8 +202,7 @@ class __$UserModelCopyWithImpl<$Res> extends _$UserModelCopyWithImpl<$Res>
 @JsonSerializable()
 class _$_UserModel extends _UserModel {
   const _$_UserModel(
-      {required this.uid,
-      required this.firstName,
+      {required this.firstName,
       required this.lastName,
       required this.email,
       required this.phoneNumber,
@@ -230,8 +214,6 @@ class _$_UserModel extends _UserModel {
   factory _$_UserModel.fromJson(Map<String, dynamic> json) =>
       _$$_UserModelFromJson(json);
 
-  @override
-  final String uid;
   @override
   final String firstName;
   @override
@@ -249,7 +231,7 @@ class _$_UserModel extends _UserModel {
 
   @override
   String toString() {
-    return 'UserModel(uid: $uid, firstName: $firstName, lastName: $lastName, email: $email, phoneNumber: $phoneNumber, streetAddress: $streetAddress, postalCode: $postalCode, city: $city)';
+    return 'UserModel(firstName: $firstName, lastName: $lastName, email: $email, phoneNumber: $phoneNumber, streetAddress: $streetAddress, postalCode: $postalCode, city: $city)';
   }
 
   @override
@@ -257,7 +239,6 @@ class _$_UserModel extends _UserModel {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _UserModel &&
-            const DeepCollectionEquality().equals(other.uid, uid) &&
             const DeepCollectionEquality().equals(other.firstName, firstName) &&
             const DeepCollectionEquality().equals(other.lastName, lastName) &&
             const DeepCollectionEquality().equals(other.email, email) &&
@@ -273,7 +254,6 @@ class _$_UserModel extends _UserModel {
   @override
   int get hashCode => Object.hash(
       runtimeType,
-      const DeepCollectionEquality().hash(uid),
       const DeepCollectionEquality().hash(firstName),
       const DeepCollectionEquality().hash(lastName),
       const DeepCollectionEquality().hash(email),
@@ -295,8 +275,7 @@ class _$_UserModel extends _UserModel {
 
 abstract class _UserModel extends UserModel {
   const factory _UserModel(
-      {required String uid,
-      required String firstName,
+      {required String firstName,
       required String lastName,
       required String email,
       required String phoneNumber,
@@ -308,8 +287,6 @@ abstract class _UserModel extends UserModel {
   factory _UserModel.fromJson(Map<String, dynamic> json) =
       _$_UserModel.fromJson;
 
-  @override
-  String get uid;
   @override
   String get firstName;
   @override
diff --git a/lib/models/user/user_model.g.dart b/lib/models/user/user_model.g.dart
index 417b2a8..a546360 100644
--- a/lib/models/user/user_model.g.dart
+++ b/lib/models/user/user_model.g.dart
@@ -7,7 +7,6 @@ part of 'user_model.dart';
 // **************************************************************************
 
 _$_UserModel _$$_UserModelFromJson(Map<String, dynamic> json) => _$_UserModel(
-      uid: json['uid'] as String,
       firstName: json['firstName'] as String,
       lastName: json['lastName'] as String,
       email: json['email'] as String,
@@ -19,7 +18,6 @@ _$_UserModel _$$_UserModelFromJson(Map<String, dynamic> json) => _$_UserModel(
 
 Map<String, dynamic> _$$_UserModelToJson(_$_UserModel instance) =>
     <String, dynamic>{
-      'uid': instance.uid,
       'firstName': instance.firstName,
       'lastName': instance.lastName,
       'email': instance.email,
diff --git a/lib/services/authentication_service.dart b/lib/services/authentication_service.dart
index 4bf6c7a..0c342bd 100644
--- a/lib/services/authentication_service.dart
+++ b/lib/services/authentication_service.dart
@@ -41,7 +41,6 @@ class AuthenticationService {
         password: password,
       );
       UserModel userModel = UserModel(
-        uid: authResult.user!.uid,
         email: email,
         firstName: firstName,
         lastName: lastName,
diff --git a/lib/services/firestore_service.dart b/lib/services/firestore_service.dart
index d5c74ff..5dd1e34 100644
--- a/lib/services/firestore_service.dart
+++ b/lib/services/firestore_service.dart
@@ -1,7 +1,9 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 
+import '../locator.dart';
 import '../models/phone/phone_model.dart';
 import '../models/user/user_model.dart';
+import 'authentication_service.dart';
 
 class FirestoreService {
   /// Firestore instance
@@ -45,7 +47,9 @@ class FirestoreService {
 
   // Create User
   Future<void> createUser(UserModel userModel) async {
-    return userCollection.doc(userModel.uid).set(userModel.toDocument());
+    return userCollection
+        .doc(locator<AuthenticationService>().currentUser!.uid)
+        .set(userModel.toDocument());
   }
 
   // Read User
@@ -60,8 +64,6 @@ class FirestoreService {
 
   //  Stream User Model
   Stream<UserModel?> streamUser(String? documentId) {
-    print('streamUser: $documentId');
-    print('streamUser: ${userCollection.doc(documentId)}');
     return userCollection
         .doc(documentId)
         .snapshots()