diff --git a/date_views/includes/date_views_argument_handler_simple.inc b/date_views/includes/date_views_argument_handler_simple.inc
index faff05a..1e947e5 100644
--- a/date_views/includes/date_views_argument_handler_simple.inc
+++ b/date_views/includes/date_views_argument_handler_simple.inc
@@ -57,23 +57,17 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
    * formatted appropriately for this argument.
    */
   function get_default_argument($raw = FALSE) {
-    $is_default = FALSE;
-
     if (!$raw && $this->options['default_argument_type'] == 'date') {
       $granularity = $this->options['granularity'];
       if ($granularity == 'week') {
         $now = date_now();
         $week = date_week(date_format($now, 'Y-m-d'));
-        $value = date_format($now, 'Y') . '-W' . $week;
+        return date_format($now, 'Y') . '-W' . $week;
       }
       else {
-        $value = date($this->arg_format, REQUEST_TIME);
+        return date($this->arg_format, REQUEST_TIME);
       }
-      drupal_alter('date_default_argument', $this, $value);
-
-      return $value;
     }
-
     // Let the parent argument handle options like node created date.
     return parent::get_default_argument($raw);
   }
@@ -85,7 +79,7 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
     $options = parent::option_definition();
     $options['year_range'] = array('default' => '-3:+3');
     $options['granularity'] = array('default' => 'month');
-    $options['default_argument_type'] = array('default' => 'date');
+    $options['default_argument_type']['default'] = 'date';
     $options['add_delta'] = array('default' => '');
     $options['use_fromto'] = array('default' => '');
     $options['title_format'] = array('default' => '');
@@ -279,9 +273,6 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
     // If requested, add the delta field to the view so we can later find the value that matched our query.
     if (!empty($this->options['add_delta']) && (substr($this->real_field, -6) == '_value' || substr($this->real_field, -7) == '_value2')) {
       $this->query->add_field($this->table_alias, 'delta');
-      $real_field_name = str_replace(array('_value', '_value2'), '', $this->real_field);
-      $this->query->add_field($this->table_alias, 'entity_id', 'date_id_' . $real_field_name);
-      $this->query->add_field($this->table_alias, 'delta', 'date_delta_' . $real_field_name);
     }
 
     $format = $this->date_handler->granularity == 'week' ? DATE_FORMAT_DATETIME : $this->sql_format;