diff --git a/controllers/tourController.js b/controllers/tourController.js
index 2ea52c1d08535dae18eea6f9242c70cd6833f2d6..82b40583678b8753663b1c98b3b2862a9938ff21 100644
--- a/controllers/tourController.js
+++ b/controllers/tourController.js
@@ -1,5 +1,4 @@
-const Tour = require('../models/tourModel');
-const User = require('../models/userModel');
+const { User, Tour } = require('../models/tourModel');
 
 exports.getTours = async (req, res) => {
   try {
diff --git a/models/tourModel.js b/models/tourModel.js
index 8889f899dcb4a25e59151504464f3ee7aa7bff1b..60dce7c45f951d89c5eca18b4e35a83ca247edde 100644
--- a/models/tourModel.js
+++ b/models/tourModel.js
@@ -46,5 +46,4 @@ class User {
     }
 }
 
-module.exports = User;
-module.exports = Tour;
+module.exports = { User, Tour };
diff --git a/models/userModel.js b/models/userModel.js
deleted file mode 100644
index 42722a92cbef81f6fe9199e70e830a1ce4917b83..0000000000000000000000000000000000000000
--- a/models/userModel.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const db = require('../config/db'); // ดึง Database connection
-const bcrypt = require('bcryptjs');
-
-class User {
-    static async findOne(email) {
-        return new Promise((resolve, reject) => {
-            db.query('SELECT * FROM users WHERE email = ?', [email], (err, results) => {
-                if (err) return reject(err);
-                resolve(results[0]); // คืนค่า user ที่เจอ หรือ undefined
-            });
-        });
-    }
-
-    static async create(name, email, password) {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const hashedPassword = await bcrypt.hash(password, 10);
-                db.query(
-                    'INSERT INTO users (name, email, password) VALUES (?, ?, ?)',
-                    [name, email, hashedPassword],
-                    (err, results) => {
-                        if (err) return reject(err);
-                        resolve(results.insertId); // คืนค่า ID ของ user ที่ถูกสร้าง
-                    }
-                );
-            } catch (err) {
-                reject(err);
-            }
-        });
-    }
-
-    static async comparePassword(email, password) {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const user = await this.findOne(email);
-                if (!user) return resolve(false); // ไม่เจอผู้ใช้
-                const isMatch = await bcrypt.compare(password, user.password);
-                resolve(isMatch);
-            } catch (err) {
-                reject(err);
-            }
-        });
-    }
-}
-
-module.exports = User;