diff --git a/pitfall/pitfall/document.rkt b/pitfall/pitfall/document.rkt
index cd0c526f..d95a2e52 100644
--- a/pitfall/pitfall/document.rkt
+++ b/pitfall/pitfall/document.rkt
@@ -90,9 +90,7 @@
 (define (end-doc doc)
   (for-each page-end ($doc-pages doc))
 
-  (define doc-info (make-ref))
-  (for ([(key val) (in-hash ($doc-info doc))])
-    (dict-set! doc-info key val))
+  (define doc-info (make-ref ($doc-info doc)))
   (ref-end doc-info)
     
   (for ([font (in-hash-values ($doc-font-families doc))])
@@ -107,114 +105,19 @@
       
   (define xref-offset (file-position (current-output-port)))
   (write-bytes-out "xref")
-  (write-bytes-out (format "0 ~a" (add1 (length ($doc-refs doc)))))
+  (define xref-count (add1 (length ($doc-refs doc))))
+  (write-bytes-out (format "0 ~a" xref-count))
   (write-bytes-out "0000000000 65535 f ")
   (for ([ref (in-list (reverse ($doc-refs doc)))])
     (write-bytes-out
      (string-append (~r ($ref-offset ref) #:min-width 10 #:pad-string "0") " 00000 n ")))
   (write-bytes-out "trailer")
-  (write-bytes-out (convert (mhasheq 'Size (add1 (length ($doc-refs doc)))
+  (write-bytes-out (convert (mhasheq 'Size xref-count
                                      'Root ($doc-root doc)
                                      'Info doc-info)))
   (write-bytes-out "startxref")
   (write-bytes-out (numberizer xref-offset))
   (write-bytes-out "%%EOF"))
 
-#;(define PDFDocument
-    (class (annotation-mixin
-            (image-mixin
-             (text-mixin
-              (fonts-mixin
-               (vector-mixin
-                (color-mixin (class object%
-                               (super-new)
-                               (field [@pages null])
-                               (define/public (page) (first @pages))                  
-                               (define/public (add-content data)
-                                 (page-write (first @pages) data)))))))))
-      (set-current-ref-id! 1)
-      (register-ref-listener (λ (ref) (store-ref ref)))
-
-      (super-new)
-      (init-field [(@options options) (mhasheq)])
-      (field [@refs null]
-             [@root (make-ref (mhasheq 'Type 'Catalog
-                                       'Pages (make-ref (mhasheq 'Type 'Pages))))]
-             ;; initialize the metadata
-             [@info (mhasheq 'Producer "PITFALL"
-                             'Creator "PITFALL"
-                             'CreationDate (current-seconds))])
-
-      ;; initialize mixins
-      (inherit-field @ctm) ; from vector mixin
-      (inherit-field @font-families) (inherit font) ; from font mixin
-      (inherit-field [@x x] [@y y]) ; from text
-      (inherit transform) ; from vector
-      (inherit-field @pages) (inherit page) ; from base
-
-      ;; initialize params
-      (current-compress-streams? (hash-ref @options 'compress #t))
-      (current-auto-first-page (hash-ref @options 'autoFirstPage #t))
-      (when (current-auto-first-page) (add-page))
-      (when (current-auto-helvetica) (font "Helvetica"))
-
-      ;; copy options
-      (for ([(key val) (in-hash (hash-ref @options 'info (hasheq)))]) 
-        (hash-set! @info key val))
-
-      (define/public (store-ref ref)
-        (set! @refs (cons ref @refs)))
-
-      (define/public (add-page [options-arg @options])
-        ;; create a page object
-        (define page-parent (dict-ref @root 'Pages))
-        (set! @pages (cons (make-page page-parent options-arg) @pages))
-      
-        ;; reset x and y coordinates
-        (set! @x (margin-left ($page-margins (page))))
-        (set! @y (margin-right ($page-margins (page))))
-        ;; flip PDF coordinate system so that the origin is in
-        ;; the top left rather than the bottom left
-        (set! @ctm default-ctm-value)
-        (transform 1 0 0 -1 0 ($page-height (page)))
-        this)
-
-      (define/public (start-doc)
-        (write-bytes-out (format "%PDF-~a" (current-pdf-version)))
-        (write-bytes-out "%ÿÿÿÿ"))
-
-      (define/public (end-doc)
-        (for-each page-end @pages)
-
-        (define doc-info (make-ref))
-        (for ([(key val) (in-hash @info)])
-          (dict-set! doc-info key val))
-        (ref-end doc-info)
-    
-        (for ([font (in-hash-values @font-families)])
-          (send font end))
-
-        (define pages-ref (dict-ref @root 'Pages))
-        (dict-set! pages-ref 'Count (length @pages))
-        (dict-set! pages-ref 'Kids (map $page-dictionary (reverse @pages)))
-        (ref-end pages-ref)
-      
-        (ref-end @root)
-      
-        (define xref-offset (file-position (current-output-port)))
-        (write-bytes-out "xref")
-        (write-bytes-out (format "0 ~a" (add1 (length @refs))))
-        (write-bytes-out "0000000000 65535 f ")
-        (for ([ref (in-list @refs)])
-          (write-bytes-out
-           (string-append (~r ($ref-offset ref) #:min-width 10 #:pad-string "0") " 00000 n ")))
-        (write-bytes-out "trailer")
-        (write-bytes-out (convert (mhasheq 'Size (add1 (length @refs))
-                                           'Root @root
-                                           'Info doc-info)))
-        (write-bytes-out "startxref")
-        (write-bytes-out (numberizer xref-offset))
-        (write-bytes-out "%%EOF"))))
-
 (module+ test
   (define d (make-$doc)))
\ No newline at end of file