diff --git a/module/VuFind/src/VuFind/Controller/CombinedController.php b/module/VuFind/src/VuFind/Controller/CombinedController.php
index ef04476b8fcd9dcc2563e5f6c2ce97f897c06938..8331340602f7eb6a5d2658d68cf87f27bfd652b4 100644
--- a/module/VuFind/src/VuFind/Controller/CombinedController.php
+++ b/module/VuFind/src/VuFind/Controller/CombinedController.php
@@ -109,10 +109,7 @@ class CombinedController extends AbstractSearch
               'searchClassId' => $searchClassId,
               'currentSearch' => $settings,
               'showCartControls' => $currentOptions->supportsCart()
-                && $cart->isActive(),
-              'showBulkOptions' => $currentOptions->supportsCart()
-                && isset($general->Site->showBulkOptions)
-                && $general->Site->showBulkOptions
+                && $cart->isActive()
             );
             $html = $this->getViewRenderer()->render(
                 'combined/results-list.phtml',
@@ -194,9 +191,6 @@ class CombinedController extends AbstractSearch
             $placement = 'distributed';
         }
 
-        // Get default config for showBulkOptions
-        $settings = $this->getServiceLocator()->get('VuFind\Config')->get('config');
-
         // Build view model:
         return $this->createViewModel(
             array(
@@ -207,9 +201,7 @@ class CombinedController extends AbstractSearch
                 'placement' => $placement,
                 'results' => $results,
                 'supportsCart' => $supportsCart,
-                'supportsCartOptions' => $supportsCartOptions,
-                'showBulkOptions' => isset($settings->Site->showBulkOptions)
-                  && $settings->Site->showBulkOptions
+                'supportsCartOptions' => $supportsCartOptions
             )
         );
     }
diff --git a/themes/bootstrap3/templates/combined/results-list.phtml b/themes/bootstrap3/templates/combined/results-list.phtml
index fa1f250eee05b509cd2d6d6c6bba8b4601a476bb..6b5f7ee54cbf47bd1c4e08a62377845df20fc492 100644
--- a/themes/bootstrap3/templates/combined/results-list.phtml
+++ b/themes/bootstrap3/templates/combined/results-list.phtml
@@ -69,8 +69,7 @@
     $viewParams = array(
       'results' => $results,
       'params' => $params,
-      'showCartControls' => $this->showCartControls,
-      'showBulkOptions' => $this->showBulkOptions
+      'showCartControls' => $this->showCartControls
     );
   ?>
   <?=$this->render('search/list-' . $viewType . '.phtml', $viewParams)?>
diff --git a/themes/bootstrap3/templates/combined/results.phtml b/themes/bootstrap3/templates/combined/results.phtml
index e2988b6daaccae735a91382b51ff77af93e50917..68f85321dfe5b876a025d3f9f069e40478669b42 100644
--- a/themes/bootstrap3/templates/combined/results.phtml
+++ b/themes/bootstrap3/templates/combined/results.phtml
@@ -36,8 +36,6 @@
 
   // Disable cart if appropriate:
   $this->showCartControls = $this->supportsCart && $this->cart()->isActive();
-  // Disable bulk options if appropriate:
-  $this->showBulkOptions = $this->supportsCart && $this->showBulkOptions;
 
   // Load Javascript dependencies into header:
   $this->headScript()->appendFile("check_item_statuses.js");
@@ -64,8 +62,7 @@
       'searchClassId' => $searchClassId,
       'combinedResults' => $this->combinedResults,
       'supportsCartOptions' => $this->supportsCartOptions,
-      'showCartControls' => $this->showCartControls,
-      'showBulkOptions' => $this->showBulkOptions
+      'showCartControls' => $this->showCartControls
     );
   ?>
   <?=$this->context($this)->renderInContext('combined/stack-'.$placement.'.phtml', $viewParams)?>
diff --git a/themes/bootstrap3/templates/combined/stack-distributed.phtml b/themes/bootstrap3/templates/combined/stack-distributed.phtml
index 6344f61f376bba061b1a105db7dac6a137c5de7d..d0634162e16e57517ac4de3094e8833e26bfb98b 100644
--- a/themes/bootstrap3/templates/combined/stack-distributed.phtml
+++ b/themes/bootstrap3/templates/combined/stack-distributed.phtml
@@ -18,8 +18,6 @@
             $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
             // Disable cart if appropriate:
             $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
-            // Disable bulk options if appropriate:
-            $viewParams['showBulkOptions'] = $this->supportsCartOptions[$columnIndex] && $this->showBulkOptions;
           ?>
           <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
             <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
diff --git a/themes/bootstrap3/templates/combined/stack-left.phtml b/themes/bootstrap3/templates/combined/stack-left.phtml
index 66666fd86f243fa2c1a628fd63f68e92542f4e99..803cd3fc9fc380a819072e6fc3d77e5def676708 100644
--- a/themes/bootstrap3/templates/combined/stack-left.phtml
+++ b/themes/bootstrap3/templates/combined/stack-left.phtml
@@ -11,8 +11,6 @@
       $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
       // Disable cart if appropriate:
       $viewParams['showCartControls'] = $this->showCartControls;
-      // Disable bulk options if appropriate:
-      $viewParams['showBulkOptions'] = $this->showBulkOptions;
     ?>
     <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
       <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
diff --git a/themes/bootstrap3/templates/combined/stack-right.phtml b/themes/bootstrap3/templates/combined/stack-right.phtml
index c38a48f17b7f047e6abb2a9cd7dc2a79fe4c899c..adeb4ee29e800512d7a3107aeea6ba3481c14f38 100644
--- a/themes/bootstrap3/templates/combined/stack-right.phtml
+++ b/themes/bootstrap3/templates/combined/stack-right.phtml
@@ -11,8 +11,6 @@
       $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
       // Disable cart if appropriate:
       $viewParams['showCartControls'] = $this->showCartControls;
-      // Disable bulk options if appropriate:
-      $viewParams['showBulkOptions'] = $this->showBulkOptions;
     ?>
     <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
       <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
diff --git a/themes/bootstrap3/templates/search/list-list.phtml b/themes/bootstrap3/templates/search/list-list.phtml
index 624b9d9f0c6c03b99e34ed27c378b05e471b456a..db6556a5c019080632d23b1a8a678ac3009a96a9 100644
--- a/themes/bootstrap3/templates/search/list-list.phtml
+++ b/themes/bootstrap3/templates/search/list-list.phtml
@@ -1,16 +1,11 @@
 <? if (!isset($this->indexStart)) $this->indexStart = 0; ?>
-<? $showCheckboxes = (isset($this->showCartControls) && $this->showCartControls)
-  || (isset($this->showBulkOptions) && $this->showBulkOptions); ?>
+<? $showCheckboxes = (isset($this->showCartControls) && $this->showCartControls) ?>
 <? $i = $this->indexStart; foreach ($this->results->getResults() as $current):
   $recordNumber = $this->results->getStartRecord()+$i-$this->indexStart; ?>
   <div id="result<?=$i++ ?>" class="row result clearfix">
     <div class="col-xs-1 hidden-print<? if ($showCheckboxes): ?> checkbox<? endif; ?>">
       <label>
-<<<<<<< HEAD
-        <? if (!isset($this->hideCartControls) && $this->cart()->isActive()): ?>
-=======
         <? if ($showCheckboxes): ?>
->>>>>>> b916700... Per column cart support checking and logic compression.
           <?=$this->record($current)->getCheckbox()?>
         <? endif; ?>
         <?=$recordNumber?>
diff --git a/themes/bootstrap3/templates/search/results.phtml b/themes/bootstrap3/templates/search/results.phtml
index dfa5837445eb1235cfd145f8f710d362df5ba01b..318cee8337114760e3f58cf1dd245259fdf2f9e2 100644
--- a/themes/bootstrap3/templates/search/results.phtml
+++ b/themes/bootstrap3/templates/search/results.phtml
@@ -31,15 +31,7 @@
   }
 
   // Disable cart if appropriate:
-<<<<<<< HEAD
-  if (!$this->params->getOptions()->supportsCart()) {
-    $this->hideCartControls = true;
-  }
-=======
   $this->showCartControls = $this->params->getOptions()->supportsCart() && $this->cart()->isActive();
-  // Disable bulk options if appropriate:
-  $this->showBulkOptions = $this->params->getOptions()->supportsCart() && $this->showBulkOptions;
->>>>>>> b916700... Per column cart support checking and logic compression.
 
   // Load Javascript dependencies into header:
   $this->headScript()->appendFile("check_item_statuses.js");