diff --git a/src/act.offensive.c b/src/act.offensive.c
index 4ad4b61..2f5096a 100644
--- a/src/act.offensive.c
+++ b/src/act.offensive.c
@@ -458,6 +458,11 @@ ACMD(do_whirlwind)
     return;
   }
   
+  if ROOM_FLAGGED(IN_ROOM(ch), ROOM_PEACEFUL) {
+    send_to_char(ch, "This room just has such a peaceful, easy feeling...\r\n");
+    return;
+  }
+
   if (GET_POS(ch) < POS_FIGHTING) {
     send_to_char(ch, "You must be on your feet to perform a whirlwind.\r\n");
     return;    
diff --git a/src/act.wizard.c b/src/act.wizard.c
index a7346d2..d470dca 100644
--- a/src/act.wizard.c
+++ b/src/act.wizard.c
@@ -2043,11 +2043,6 @@ ACMD(do_last)
       return;
     }
 
-    if ((GET_LEVEL(vict) > GET_LEVEL(ch)) && (GET_LEVEL(ch) < LVL_IMPL)) {
-      send_to_char(ch, "You are not sufficiently godly for that!\r\n");
-      return;
-    }
-
     send_to_char(ch, "[%5ld] [%2d %s] %-12s : %-18s : %-20s\r\n",
     GET_IDNUM(vict), (int) GET_LEVEL(vict),
     class_abbrevs[(int) GET_CLASS(vict)], GET_NAME(vict),