diff --git a/mlab/citydeclouds/cdcnwgateuprlv1 b/mlab/citydeclouds/cdcnwgateuprlv1
index 73b6f6934..2679c7b27 100644
--- a/mlab/citydeclouds/cdcnwgateuprlv1
+++ b/mlab/citydeclouds/cdcnwgateuprlv1
@@ -3,13 +3,13 @@ name City de Clouds Gate
 reset_timeout 7200
 difficulty 1
 region citydeclouds
-width 35
-height 40
+width 30
+height 32
 enter_x 1
 enter_y 1
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-05-29 Arvid Norlander
+Modified: 2008-06-04 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -321,78 +321,6 @@ arch flagstone
 name floor
 name_pl floor
 face shop_empty.111
-y 32
-end
-arch cwall_3_2
-y 32
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 33
-end
-arch cwall_3_2
-y 33
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 34
-end
-arch cwall_3_2
-y 34
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 35
-end
-arch cwall_3_2
-y 35
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 36
-end
-arch cwall_3_2
-y 36
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 37
-end
-arch cwall_3_2
-y 37
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 38
-end
-arch cwall_3_2
-y 38
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-y 39
-end
-arch cwall_3_2
-y 39
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
 x 1
 end
 arch cwall_3_3
@@ -684,94 +612,6 @@ arch flagstone
 name floor
 name_pl floor
 face shop_empty.111
-x 1
-y 32
-end
-arch cwall_3_4
-x 1
-y 32
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 33
-end
-arch cwall_3_4
-x 1
-y 33
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 34
-end
-arch cwall_3_4
-x 1
-y 34
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 35
-end
-arch cwall_3_4
-x 1
-y 35
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 36
-end
-arch cwall_3_4
-x 1
-y 36
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 37
-end
-arch cwall_3_4
-x 1
-y 37
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 38
-end
-arch cwall_3_4
-x 1
-y 38
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 1
-y 39
-end
-arch cwall_3_4
-x 1
-y 39
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
 x 2
 end
 arch swall_1_4
@@ -2547,6 +2387,10 @@ arch cwall_3_1
 x 11
 y 14
 end
+arch dungeon_magic
+x 11
+y 15
+end
 arch flagstone
 name floor
 name_pl floor
@@ -2558,6 +2402,10 @@ arch swall_2_1_1
 x 11
 y 15
 end
+arch dungeon_magic
+x 11
+y 16
+end
 arch flagstone
 name floor
 name_pl floor
@@ -2955,14 +2803,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 12
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -2987,6 +2827,10 @@ arch cwall_3_1
 x 13
 y 1
 end
+arch dungeon_magic
+x 13
+y 2
+end
 arch flagstone
 name floor
 name_pl floor
@@ -3050,6 +2894,10 @@ arch cwall_1_2
 x 13
 y 6
 end
+arch dungeon_magic
+x 13
+y 7
+end
 arch flagstone
 name floor
 name_pl floor
@@ -3113,6 +2961,10 @@ arch cwall_1_2
 x 13
 y 11
 end
+arch dungeon_magic
+x 13
+y 12
+end
 arch flagstone
 name floor
 name_pl floor
@@ -3298,14 +3150,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 13
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -3566,14 +3410,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 14
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -3842,14 +3678,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 15
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -4114,14 +3942,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 16
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -4390,14 +4210,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 17
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -4662,14 +4474,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 18
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -4934,14 +4738,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 19
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -5206,14 +5002,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 20
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -5478,14 +5266,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 21
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -5750,14 +5530,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 22
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -6018,14 +5790,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 23
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -6290,14 +6054,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 24
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -6562,14 +6318,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 25
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -6834,14 +6582,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 26
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -7102,14 +6842,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 27
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -7370,14 +7102,6 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 28
-y 32
-move_block 0
-blocksview 0
-end
 arch flagstone
 name floor
 name_pl floor
@@ -7638,255 +7362,3 @@ y 31
 move_block 0
 blocksview 0
 end
-arch blocked
-name nothing
-name_pl nothing
-x 29
-y 32
-move_block 0
-blocksview 0
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 30
-end
-arch cwall_3_3
-x 30
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 30
-y 1
-end
-arch cwall_3_1
-x 30
-y 1
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 15
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 16
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 17
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 18
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 19
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 20
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 21
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 22
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 23
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 24
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 25
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 26
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 27
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 28
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 29
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 30
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 31
-move_block 0
-blocksview 0
-end
-arch blocked
-name nothing
-name_pl nothing
-x 30
-y 32
-move_block 0
-blocksview 0
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 31
-end
-arch cwall_3_3
-x 31
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 31
-y 1
-end
-arch cwall_3_1
-x 31
-y 1
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 32
-end
-arch cwall_3_3
-x 32
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 32
-y 1
-end
-arch cwall_3_1
-x 32
-y 1
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 33
-end
-arch cwall_3_3
-x 33
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 33
-y 1
-end
-arch cwall_3_1
-x 33
-y 1
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 34
-end
-arch cwall_3_3
-x 34
-end
-arch flagstone
-name floor
-name_pl floor
-face shop_empty.111
-x 34
-y 1
-end
-arch cwall_3_1
-x 34
-y 1
-end