diff --git a/basis/calendar/format/format.factor b/basis/calendar/format/format.factor
index 8d34e8a3a4..a7c4410aa5 100644
--- a/basis/calendar/format/format.factor
+++ b/basis/calendar/format/format.factor
@@ -1,7 +1,8 @@
-USING: math math.order math.parser math.functions kernel sequences io
-accessors arrays io.streams.string splitting
-combinators accessors debugger
-calendar calendar.format.macros ;
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: math math.order math.parser math.functions kernel
+sequences io accessors arrays io.streams.string splitting
+combinators accessors calendar calendar.format.macros present ;
 IN: calendar.format
 
 : pad-00 ( n -- str ) number>string 2 CHAR: 0 pad-left ;
@@ -288,3 +289,5 @@ ERROR: invalid-timestamp-format ;
             ]
         } formatted
     ] with-string-writer ;
+
+M: timestamp present timestamp>string ;
diff --git a/basis/present/present.factor b/basis/present/present.factor
index 519e995fe5..fe7025d559 100644
--- a/basis/present/present.factor
+++ b/basis/present/present.factor
@@ -1,15 +1,12 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors math math.parser calendar calendar.format
-strings words kernel effects ;
+USING: accessors math math.parser strings words kernel effects ;
 IN: present
 
 GENERIC: present ( object -- string )
 
 M: real present number>string ;
 
-M: timestamp present timestamp>string ;
-
 M: string present ;
 
 M: word present name>> ;