diff --git a/mlab/citydeclouds/citydeclouds2I b/mlab/citydeclouds/citydeclouds2I
index d88e6c3e3..e14da3db4 100644
--- a/mlab/citydeclouds/citydeclouds2I
+++ b/mlab/citydeclouds/citydeclouds2I
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-08-28 mikeeusa
-Modified: 2015-11-28 Kevin Zheng
+Modified: 2016-01-07 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 citydeclouds2H
@@ -15880,14 +15880,6 @@ y 25
 end
 arch magic_ear
 msg
-@match no
-endmsg
-x 42
-y 25
-connected 7703
-end
-arch magic_ear
-msg
 @match yes
 endmsg
 x 42
@@ -15905,12 +15897,13 @@ end
 arch guildmaster
 name High Magistrate
 msg
-@match hi|hello
-Your concerns may be addressed by a lower office.  Be gone with you now!
-...
-Unless you do happen to be a adventurer of strong will... Would you perchance risk your life on an urgent quest needed to be completed in order to save our fair city? There are troubling matters at hand. Do you accept this tenure that I am about to bestow upon you?
+@match quest
+Brave adventurer, you say? There are some troubling matters at hand. Would you risk your life on an urgent quest to save our fair city?
 @match yes
 Lying outside the city walls just under the cloud surface is a well hidden strike force of dragons aligned with the elf lord Valdak.  They have been lying in wait for months and our spies have only detected them last week! We have deduced that they are commanded by the Ancient dragon General Czarthin whom was previously lord Valdak's emissary to our city before he turned against us.  Many dragon agents have infiltrated our fair city and are believed to be under the direct command of Czarthin along with the strike force.  What is needed is the assassination of the Ancient dragon Czarthin... however a direct attack by one of our agents would bring complete destruction of our city by the strike force as well as the hundreds of mighty fire dragons stationed at the castle of lord Valdak.  We need you to silently slip into Czarthin's assembly and remove from him his life force... once done bring my Assistant a claw from his corpse.  For your reward you shall receive an esquire seal upon completion as-well as any treasure you loot from Czarthin's camp.
+@match *
+Your concerns may be addressed by a lower office. Be gone with you now!
+@reply quest But I'm a brave adventurer seeking a quest!
 endmsg
 x 42
 y 25
@@ -15946,12 +15939,6 @@ arch marble
 x 42
 y 28
 end
-arch creator
-other_arch bomb
-x 42
-y 28
-connected 7703
-end
 arch light2
 x 42
 y 29
@@ -16695,7 +16682,7 @@ arch locked_door1
 name Assistant
 slaying cdcczarthinclaw1mystarea
 msg
-Assistant: Pardon me missure but do you have the relic for thee High Magistrate that sits in the seat of power today? If not go-away.
+To claim your reward, present the assistant with proof of Czarthin's death.
 endmsg
 face halfling2.151
 x 44
@@ -18222,14 +18209,6 @@ y 44
 end
 arch blocked
 x 47
-y 45
-end
-arch blocked
-x 47
-y 46
-end
-arch blocked
-x 47
 y 47
 end
 arch blocked
@@ -18765,18 +18744,6 @@ y 44
 end
 arch blocked
 x 48
-y 45
-end
-arch magic_mouth
-msg
-Assistant: OMG! He's got a BOMB!!! Guards! Guards!! Kill the adventurer!
-endmsg
-x 48
-y 46
-connected 7703
-end
-arch blocked
-x 48
 y 47
 end
 arch teleporter
@@ -19299,14 +19266,6 @@ y 44
 end
 arch blocked
 x 49
-y 45
-end
-arch blocked
-x 49
-y 46
-end
-arch blocked
-x 49
 y 47
 end
 arch blocked