diff --git a/feeds_et.mappers.inc b/feeds_et.mappers.inc
index 9ef7734..b6b263c 100644
--- a/feeds_et.mappers.inc
+++ b/feeds_et.mappers.inc
@@ -46,6 +46,9 @@ function _feeds_et_text_feeds_set_target($source, $entity, $target, $value) {
 
 /**
  * Callback for mapping link fields.
+ *
+ * @see feeds_et_feeds_processor_targets_alter()
+ * @see \FeedsProcessor::mapToTarget()
  */
 function _feeds_et_link_feeds_set_target($source, $entity, $target, $value) {
   if (!is_array($value)) {
@@ -53,19 +56,18 @@ function _feeds_et_link_feeds_set_target($source, $entity, $target, $value) {
   }
   foreach ($value as $k => $v) {
     if (empty($v)) {
-      unset($k);
+      unset($value[$k]);
     }
-    // @todo should we do more validation here?
   }
   $target_pieces = explode(':', $target);
   $target_field = $target_pieces[0];
-  // the second parameter is the target key (title or url) for links.
+
+  // The target key will be either 'title' or 'url' for links.
   $target_key = $target_pieces[1];
   $target_language = end($target_pieces);
   _feeds_et_field_feeds_set_target($source, $entity, $target_field, $value, FALSE, $target_language, $target_key);
 }
 
-
 /**
  * Helper for mapping.
  *
diff --git a/feeds_et.module b/feeds_et.module
index d658bb3..e2667dd 100644
--- a/feeds_et.module
+++ b/feeds_et.module
@@ -34,11 +34,6 @@ function feeds_et_feeds_processor_targets_alter(&$targets, $entity_type, $bundle
           $keys[] = $field_name . ':url';
           $keys[] = $field_name . ':title';
           break;
-        case 'date':
-          $keys = array();
-          $keys[] = $field_name . ':start';
-          $keys[] = $field_name . ':end';
-          break;
       }
 
       foreach ($keys as $key) {