diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc
index ef92e688..bd2318b7 100644
--- a/src/app/zelda3/dungeon/room.cc
+++ b/src/app/zelda3/dungeon/room.cc
@@ -53,6 +53,10 @@ void Room::LoadHeader() {
   staircase_rooms_[2] = (rom()->data()[header_location + 12]);
   staircase_rooms_[3] = (rom()->data()[header_location + 13]);
 
+  CalculateRoomSize();
+}
+
+void Room::CalculateRoomSize() {
   // Calculate the size of the room based on how many objects are used per room
   // Some notes from hacker Zarby89
   // vanilla rooms are using in average ~0x80 bytes
@@ -119,7 +123,6 @@ void Room::LoadHeader() {
 }
 
 void Room::LoadRoomFromROM() {
-  // Load dungeon header
   auto rom_data = rom()->vector();
   int header_pointer = core::SnesToPc(kRoomHeaderPointer);
 
diff --git a/src/app/zelda3/dungeon/room.h b/src/app/zelda3/dungeon/room.h
index 851b12f3..0c1c6a9e 100644
--- a/src/app/zelda3/dungeon/room.h
+++ b/src/app/zelda3/dungeon/room.h
@@ -118,6 +118,7 @@ class Room : public SharedRom {
   ~Room() = default;
 
   void LoadHeader();
+  void CalculateRoomSize();
   void LoadRoomFromROM();
 
   void LoadRoomGraphics(uchar entrance_blockset = 0xFF);
@@ -161,9 +162,6 @@ class Room : public SharedRom {
   int room_id_;
   int animated_frame_;
 
-  uchar tag1_;
-  uchar tag2_;
-
   uint8_t staircase_plane_[4];
   uint8_t staircase_rooms_[4];