diff --git a/app/pages/rooms.vue b/app/pages/rooms.vue
index 3a5c2f6..7e7f00c 100644
--- a/app/pages/rooms.vue
+++ b/app/pages/rooms.vue
@@ -143,9 +143,7 @@
                     <p class="font-bold text-slate-900 truncate max-w-[160px]">
                       {{ room.room_name }}
                     </p>
-                    <p v-if="room.building" class="text-md text-slate-500 truncate max-w-[160px]">
-                      {{ room.building }}
-                    </p>
+
                   </td>
 
                   <!-- Slots -->
@@ -416,7 +414,6 @@ const saving = ref(false)
 
 const formData = ref({
   room_name: '',
-  building: '',
   description: ''
 })
 
@@ -424,7 +421,6 @@ const openAddModal = () => {
   editingRoom.value = null
   formData.value = {
     room_name: '',
-    building: '',
     description: ''
   }
   modalOpen.value = true
@@ -434,7 +430,6 @@ const openEditModal = (room) => {
   editingRoom.value = room
   formData.value = {
     room_name: room.room_name,
-    building: room.building || '',
     description: room.description || ''
   }
   modalOpen.value = true
diff --git a/app/pages/sections/[id].vue b/app/pages/sections/[id].vue
index 06a92d3..5ce8030 100644
--- a/app/pages/sections/[id].vue
+++ b/app/pages/sections/[id].vue
@@ -605,7 +605,7 @@ const extSubjectToDelete = ref(null)
 
 const { data: rooms } = await useFetch('/api/rooms')
 const roomOptions = computed(() => {
-  const opts = rooms.value?.map(r => ({ value: r.id_room, label: `${r.room_name}${r.building ? ` (${r.building})` : ''}` })) || []
+  const opts = rooms.value?.map(r => ({ value: r.id_room, label: r.room_name })) || []
   return [{ value: null, label: 'ไม่ระบุห้อง' }, ...opts]
 })
 
diff --git a/app/pages/teacher/[id].vue b/app/pages/teacher/[id].vue
index df19cf8..14e09d8 100644
--- a/app/pages/teacher/[id].vue
+++ b/app/pages/teacher/[id].vue
@@ -945,7 +945,7 @@ const roomOptions = computed(() => {
     { label: 'ไม่ระบุห้อง', value: null },
     ...rooms.value.map(r => ({
       value: r.id_room,
-      label: `${r.room_name}${r.building ? ` (${r.building})` : ''}`
+      label: r.room_name
     }))
   ]
 })
diff --git a/server/api/rooms/[id].js b/server/api/rooms/[id].js
index b387840..5cf6b2f 100644
--- a/server/api/rooms/[id].js
+++ b/server/api/rooms/[id].js
@@ -11,14 +11,12 @@ export default defineEventHandler(async (event) => {
       const stmt = db.prepare(`
         UPDATE rooms 
         SET room_name = COALESCE(?, room_name),
-            building = COALESCE(?, building),
             description = COALESCE(?, description)
         WHERE id_room = ?
       `)
 
       const result = stmt.run(
         body.room_name || null,
-        body.building !== undefined ? body.building : null,
         body.description !== undefined ? body.description : null,
         id
       )
diff --git a/server/api/rooms/index.js b/server/api/rooms/index.js
index 6ce1fd5..ad4069a 100644
--- a/server/api/rooms/index.js
+++ b/server/api/rooms/index.js
@@ -22,20 +22,18 @@ export default defineEventHandler(async (event) => {
 
     try {
       const stmt = db.prepare(`
-        INSERT INTO rooms (room_name, building, description)
-        VALUES (?, ?, ?)
+        INSERT INTO rooms (room_name, description)
+        VALUES (?, ?)
       `)
 
       const result = stmt.run(
         body.room_name,
-        body.building || null,
         body.description || null
       )
 
       return {
         id_room: result.lastInsertRowid,
         room_name: body.room_name,
-        building: body.building || null,
         description: body.description || null,
         created_at: new Date().toISOString()
       }
diff --git a/server/data/data.db b/server/data/data.db
index 9265c84..705bcca 100644
Binary files a/server/data/data.db and b/server/data/data.db differ
diff --git a/server/utils/db.js b/server/utils/db.js
index a2a8b34..19ea07c 100644
--- a/server/utils/db.js
+++ b/server/utils/db.js
@@ -258,7 +258,6 @@ db.exec(`
   CREATE TABLE IF NOT EXISTS rooms (
     id_room INTEGER PRIMARY KEY AUTOINCREMENT,
     room_name TEXT NOT NULL UNIQUE,
-    building TEXT,
     description TEXT,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP
   );`)
@@ -318,6 +317,7 @@ try {
   safeDropColumn('teachers', 'name')
   safeDropColumn('calendar_events', 'teacher_name')
   safeDropColumn('rooms', 'capacity')
+  safeDropColumn('rooms', 'building')
   safeDropColumn('Subjects', 'id_room')
   safeDropColumn('teachers', 'subject')