diff --git a/src/applications/phortune/editor/PhortuneCartEditor.php b/src/applications/phortune/editor/PhortuneCartEditor.php
index dcf1f2d0e0..854c4ab9c7 100644
--- a/src/applications/phortune/editor/PhortuneCartEditor.php
+++ b/src/applications/phortune/editor/PhortuneCartEditor.php
@@ -1,242 +1,238 @@
 <?php
 
 final class PhortuneCartEditor
   extends PhabricatorApplicationTransactionEditor {
 
   private $invoiceIssues;
 
   public function setInvoiceIssues(array $invoice_issues) {
     $this->invoiceIssues = $invoice_issues;
     return $this;
   }
 
   public function getInvoiceIssues() {
     return $this->invoiceIssues;
   }
 
   public function isInvoice() {
     return (bool)$this->invoiceIssues;
   }
 
   public function getEditorApplicationClass() {
     return 'PhabricatorPhortuneApplication';
   }
 
   public function getEditorObjectsDescription() {
     return pht('Phortune Carts');
   }
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhortuneCartTransaction::TYPE_CREATED;
     $types[] = PhortuneCartTransaction::TYPE_PURCHASED;
     $types[] = PhortuneCartTransaction::TYPE_HOLD;
     $types[] = PhortuneCartTransaction::TYPE_REVIEW;
     $types[] = PhortuneCartTransaction::TYPE_CANCEL;
     $types[] = PhortuneCartTransaction::TYPE_REFUND;
     $types[] = PhortuneCartTransaction::TYPE_INVOICED;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhortuneCartTransaction::TYPE_CREATED:
       case PhortuneCartTransaction::TYPE_PURCHASED:
       case PhortuneCartTransaction::TYPE_HOLD:
       case PhortuneCartTransaction::TYPE_REVIEW:
       case PhortuneCartTransaction::TYPE_CANCEL:
       case PhortuneCartTransaction::TYPE_REFUND:
       case PhortuneCartTransaction::TYPE_INVOICED:
         return null;
     }
 
     return parent::getCustomTransactionOldValue($object, $xaction);
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhortuneCartTransaction::TYPE_CREATED:
       case PhortuneCartTransaction::TYPE_PURCHASED:
       case PhortuneCartTransaction::TYPE_HOLD:
       case PhortuneCartTransaction::TYPE_REVIEW:
       case PhortuneCartTransaction::TYPE_CANCEL:
       case PhortuneCartTransaction::TYPE_REFUND:
       case PhortuneCartTransaction::TYPE_INVOICED:
         return $xaction->getNewValue();
     }
 
     return parent::getCustomTransactionNewValue($object, $xaction);
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhortuneCartTransaction::TYPE_CREATED:
       case PhortuneCartTransaction::TYPE_PURCHASED:
       case PhortuneCartTransaction::TYPE_HOLD:
       case PhortuneCartTransaction::TYPE_REVIEW:
       case PhortuneCartTransaction::TYPE_CANCEL:
       case PhortuneCartTransaction::TYPE_REFUND:
       case PhortuneCartTransaction::TYPE_INVOICED:
         return;
     }
 
     return parent::applyCustomInternalTransaction($object, $xaction);
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhortuneCartTransaction::TYPE_CREATED:
       case PhortuneCartTransaction::TYPE_PURCHASED:
       case PhortuneCartTransaction::TYPE_HOLD:
       case PhortuneCartTransaction::TYPE_REVIEW:
       case PhortuneCartTransaction::TYPE_CANCEL:
       case PhortuneCartTransaction::TYPE_REFUND:
       case PhortuneCartTransaction::TYPE_INVOICED:
         return;
     }
 
     return parent::applyCustomExternalTransaction($object, $xaction);
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject(pht('Order %d: %s', $id, $name));
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
 
     if ($this->isInvoice()) {
       $issues = $this->getInvoiceIssues();
       foreach ($issues as $key => $issue) {
         $issues[$key] = '  - '.$issue;
       }
       $issues = implode("\n", $issues);
 
       $overview = pht(
         "Payment for this invoice could not be processed automatically:\n\n".
         "%s",
         $issues);
 
       $body->addRemarkupSection(null, $overview);
 
       $body->addLinkSection(
         pht('PAY NOW'),
         PhabricatorEnv::getProductionURI($object->getCheckoutURI()));
     }
 
     $items = array();
     foreach ($object->getPurchases() as $purchase) {
       $name = $purchase->getFullDisplayName();
       $price = $purchase->getTotalPriceAsCurrency()->formatForDisplay();
 
       $items[] = "{$name} {$price}";
     }
 
     $body->addTextSection(pht('ORDER CONTENTS'), implode("\n", $items));
 
     if ($this->isInvoice()) {
       $subscription = id(new PhortuneSubscriptionQuery())
         ->setViewer($this->requireActor())
         ->withPHIDs(array($object->getSubscriptionPHID()))
         ->executeOne();
       if ($subscription) {
         $body->addLinkSection(
           pht('SUBSCRIPTION'),
           PhabricatorEnv::getProductionURI($subscription->getURI()));
       }
     } else {
       $body->addLinkSection(
         pht('ORDER DETAIL'),
         PhabricatorEnv::getProductionURI($object->getDetailURI()));
     }
 
     $account_uri = '/phortune/'.$object->getAccount()->getID().'/';
     $body->addLinkSection(
       pht('ACCOUNT OVERVIEW'),
       PhabricatorEnv::getProductionURI($account_uri));
 
     return $body;
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     $phids = array();
 
-    // Reload the cart to pull merchant and account information, in case we
-    // just created the object.
+    // Reload the cart to pull account information, in case we just created the
+    // object.
     $cart = id(new PhortuneCartQuery())
       ->setViewer($this->requireActor())
       ->withPHIDs(array($object->getPHID()))
       ->executeOne();
 
     foreach ($cart->getAccount()->getMemberPHIDs() as $account_member) {
       $phids[] = $account_member;
     }
 
-    foreach ($cart->getMerchant()->getMemberPHIDs() as $merchant_member) {
-      $phids[] = $merchant_member;
-    }
-
     return $phids;
   }
 
   protected function getMailCC(PhabricatorLiskDAO $object) {
     return array();
   }
 
   protected function getMailSubjectPrefix() {
     return '[Phortune]';
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new PhortuneCartReplyHandler())
       ->setMailReceiver($object);
   }
 
   protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
     // We need the purchases in order to build mail.
     return id(new PhortuneCartQuery())
       ->setViewer($this->getActor())
       ->withIDs(array($object->getID()))
       ->needPurchases(true)
       ->executeOne();
   }
 
   protected function getCustomWorkerState() {
     return array(
       'invoiceIssues' => $this->invoiceIssues,
     );
   }
 
   protected function loadCustomWorkerState(array $state) {
     $this->invoiceIssues = idx($state, 'invoiceIssues');
     return $this;
   }
 
 }