diff --git amazon.admin.inc amazon.admin.inc
index 7e41d99..f923174 100644
--- amazon.admin.inc
+++ amazon.admin.inc
@@ -62,28 +62,8 @@ function amazon_settings_form($form_state) {
 }
 
 function amazon_storage_settings_form() {
-  $form['amazon_explain'] = array(
-    '#type' => 'markup',
-    '#value' => t("Storing Amazon product information in the Drupal database can speed up the display of commonly viewed products. In addition, stored product data can be included in content displayed by the Views module. On some sites, though, this functionality is unecessary and can be disabled."),
-  );
-
-  $form['amazon_cache'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Store Amazon data locally'),
-    '#default_value' => variable_get('amazon_cache', TRUE),
-  );
-
-  if (!variable_get('amazon_cache', TRUE)) {
-    $form['details']['#prefix'] = '<div id="amazon-storage-details" class="js-hide">';
-  }
-  else {
-    $form['details']['#prefix'] = '<div id="amazon-storage-details">';
-  }
-
-  $form['details']['#suffix'] = '</div>';
 
-  $period = array(0 => t('Never'));
-  $period += drupal_map_assoc(array(43200, 86400, 604800), 'format_interval');
+  $period = drupal_map_assoc(array(3600, 7200, 14400, 21600, 43200, 86400), 'format_interval');
   $form['details']['amazon_refresh_schedule'] = array(
     '#type' => 'select',
     '#title' => t('Amazon refresh schedule'),
@@ -141,7 +121,7 @@ function amazon_test_form_submit($form, &$form_state) {
   if (is_array($items)) {
     $item = array_pop($items);
     amazon_item_delete($item['asin']);
-    amazon_item_save($item);
+    amazon_item_insert($item);
 
     // We could probably be sneaky and put the Amazon data in here directly,
     // but SimpleXML objects can't be serialized, and setting rebuild = TRUE
diff --git amazon.module amazon.module
index 9aaabae..66d3822 100644
--- amazon.module
+++ amazon.module
@@ -302,6 +302,7 @@ function amazon_item_lookup_from_web($item_ids = array()) {
   $amazon_limit = 10;  // Amazon will accept no more than 10 items
   $asins = array();
   $results = array();
+  $item_ids = array_filter($item_ids);  // Remove any empty items.
   foreach ($item_ids as $asin) {
     if (!empty($asin)) {
       $asins[] = $asin;
@@ -347,7 +348,7 @@ function _amazon_item_batch_lookup_from_web($item_ids = array()) {
     $items = array();
     foreach($results->Items->Item as $xml) {
       $item = amazon_item_clean_xml($xml);
-      amazon_item_save($item);
+      amazon_item_insert($item);
       $items["{$item['asin']}"] = $item;
     }
     return $items;
@@ -540,21 +541,6 @@ function amazon_item_insert($item) {
 }
 
 /**
- * Save 'cleaned' Amazon item into database.
- * @param $item
- *   'Cleaned' amazon item to insert.
- * @param $force_save
- *   if TRUE, save even though the caching is turned off in admin interface.
- * @return no return.
- */
-function amazon_item_save($item, $force_save = FALSE) {
-  // Only save if the user has turned on local persistence.
-  if (variable_get('amazon_cache', TRUE) || $force_save) {
-    amazon_item_insert($item, TRUE);
-  }
-}
-
-/**
  * Delete all vestiges of Amazon item.
  * @param $asin
  *   ASIN to be deleted.
@@ -683,12 +669,12 @@ function amazon_cron() {
   if (!empty($asins)) {
     if ($items = amazon_item_lookup_from_web($asins)) {
       foreach ($items as $item) {
-        amazon_item_save($item);
+        amazon_item_insert($item);
       }
-      watchdog('Amazon', 'Amazon items were updated.');
+      watchdog('amazon', 'Amazon items were updated.');
     }
     else {
-      watchdog('Amazon', 'Amazon items could not be updated.');
+      watchdog('amazon', 'Amazon items could not be updated.');
     }
   }
 }