diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index e1009ec77f6..30e49c8cd7e 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -1559,7 +1559,6 @@ public class AssignmentManager extends ZooKeeperListener {
       Map.Entry<String, RegionPlan> e = i.next();
       if (e.getValue().getDestination().equals(hsi)) {
         // Use iterator's remove else we'll get CME
-        LOG.info("REMOVING PLAN " + e.getValue());
         i.remove();
       }
     }
diff --git a/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java b/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
new file mode 100644
index 00000000000..eb01a6a7d15
--- /dev/null
+++ b/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2010 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.master.handler;
+
+import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.Server;
+import org.apache.hadoop.hbase.master.DeadServer;
+import org.apache.hadoop.hbase.master.MasterServices;
+
+/**
+ * Shutdown handler for the server hosting <code>-ROOT-</code>,
+ * <code>.META.</code>, or both.
+ */
+public class MetaServerShutdownHandler extends ServerShutdownHandler {
+  private final boolean carryingRoot;
+  private final boolean carryingMeta;
+  
+  public MetaServerShutdownHandler(final Server server,
+      final MasterServices services,
+      final DeadServer deadServers, final HServerInfo hsi,
+      final boolean carryingRoot, final boolean carryingMeta) {
+    super(server, services, deadServers, hsi, EventType.M_META_SERVER_SHUTDOWN);
+    this.carryingRoot = carryingRoot;
+    this.carryingMeta = carryingMeta;
+  }
+
+  @Override
+  boolean isCarryingRoot() {
+    return this.carryingRoot;
+  }
+
+  @Override
+  boolean isCarryingMeta() {
+    return this.carryingMeta;
+  }
+}