diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index 359eae59f..2fbd6f1e7 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -219,7 +219,8 @@ int CmdInfo::execute (std::string& output)
       if (format == "")
         format = context.config.get ("dateformat");
 
-      view.set (row, 1, getDueDate (*task, format));
+      Date dt (task->get_date ("due"));
+      view.set (row, 1, dt.toString (context.config.get ("dateformat")));
     }
 
     // wait
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 708d9ccbc..7fe31a19a 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -374,7 +374,7 @@ int CmdShow::execute (std::string& output)
 #endif
 
   // Check for bad values in rc.annotations.
-  // TODO Reconsider this.
+  // TODO Deprecated.
   std::string annotations = context.config.get ("annotations");
   if (annotations != "full"   &&
       annotations != "sparse" &&
diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp
index 60e948ffa..fa6dfe6ec 100644
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@@ -120,7 +120,13 @@ int CmdTimesheet::execute (std::string& output)
           if (format == "")
             format = context.config.get ("dateformat");
           completed.set (row, 1, task->get ("project"), c);
-          completed.set (row, 2, getDueDate (*task, format), c);
+
+          if(task->has ("due"))
+          {
+            Date dt (task->get_date ("due"));
+            completed.set (row, 2, dt.toString (format));
+          }
+
           completed.set (row, 3, getFullDescription (*task, "timesheet"), c);
         }
       }
@@ -158,7 +164,13 @@ int CmdTimesheet::execute (std::string& output)
           if (format == "")
             format = context.config.get ("dateformat");
           started.set (row, 1, task->get ("project"), c);
-          started.set (row, 2, getDueDate (*task, format), c);
+
+          if(task->has ("due"))
+          {
+            Date dt (task->get_date ("due"));
+            started.set (row, 2, dt.toString (format));
+          }
+
           started.set (row, 3, getFullDescription (*task, "timesheet"), c);
 
         }
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 5f3310501..443667c9c 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -106,17 +106,4 @@ std::string getFullDescription (Task& task, const std::string& report)
   return desc;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-std::string getDueDate (Task& task, const std::string& format)
-{
-  std::string due = task.get ("due");
-  if (due.length ())
-  {
-    Date d (atoi (due.c_str ()));
-    due = d.toString (format);
-  }
-
-  return due;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main.h b/src/main.h
index 72df1e11d..c16dd2246 100644
--- a/src/main.h
+++ b/src/main.h
@@ -50,7 +50,6 @@ bool nag (Task&);
 
 // helpers.cpp
 std::string getFullDescription (Task&, const std::string&);
-std::string getDueDate (Task&, const std::string&);
 
 // rules.cpp
 void initializeColorRules ();