diff --git a/fontland/fontland/db.rkt b/fontland/fontland/db.rkt
index 7a62add7..322f7ade 100644
--- a/fontland/fontland/db.rkt
+++ b/fontland/fontland/db.rkt
@@ -1,6 +1,6 @@
 #lang debug racket
-(require sugar/debug sugar/cache racket/class racket/match
-         db racket/logging racket/draw openssl/sha1 racket/runtime-path)
+(require sugar/cache racket/match
+         db racket/runtime-path)
 (provide (all-defined-out))
 
 (define-runtime-path db-file "fontland.sqlite")
@@ -20,7 +20,7 @@
 (define (add-record! rec)
   (query-exec-logging "insert or replace into layouts (crc, layout) values ($1, $2)" (car rec) (cdr rec)))
 
-(define/caching (get-layout-from-db which)
+(define (get-layout-from-db which)
   (match (query-rows-logging "select layout from layouts where crc==$1" which)
     [(list (vector val)) val]
     [_ #false]))
diff --git a/fontland/fontland/directory.rkt b/fontland/fontland/directory.rkt
index d816712c..39c5afee 100644
--- a/fontland/fontland/directory.rkt
+++ b/fontland/fontland/directory.rkt
@@ -3,10 +3,7 @@
          "tables.rkt"
          racket/dict
          sugar/unstable/dict
-         racket/string
-         sugar/unstable/class
-         sugar/unstable/js
-         racket/class)
+         racket/string)
 
 (provide (all-defined-out))
 
diff --git a/fontland/fontland/glyph.rkt b/fontland/fontland/glyph.rkt
index 9118e85e..4cb4e20a 100644
--- a/fontland/fontland/glyph.rkt
+++ b/fontland/fontland/glyph.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require (for-syntax)
-         sugar/unstable/dict
+(require sugar/unstable/dict
          "unsafe/freetype.rkt"
          "table-stream.rkt"
          "struct.rkt"
diff --git a/fontland/fontland/glyphrun.rkt b/fontland/fontland/glyphrun.rkt
index 4353df84..fc1ad291 100644
--- a/fontland/fontland/glyphrun.rkt
+++ b/fontland/fontland/glyphrun.rkt
@@ -1,7 +1,5 @@
 #lang racket/base
-(require sugar/unstable/js
-         racket/class
-         "glyph-position.rkt")
+(require "glyph-position.rkt")
 (provide (all-defined-out))
 
 #|
diff --git a/fontland/fontland/helper.rkt b/fontland/fontland/helper.rkt
index 60f25477..c1d15c9a 100644
--- a/fontland/fontland/helper.rkt
+++ b/fontland/fontland/helper.rkt
@@ -12,21 +12,4 @@
 (define-runtime-path fira-path "assets/fira.ttf")
 (define-runtime-path fira-otf-path "assets/fira.otf")
 (define-runtime-path charter-directory-path "assets/charter-directory.rktd")
-(define-runtime-path charter-italic-directory-path "assets/charter-italic-directory.rktd")
-
-(define-syntax (test-module stx)
-  (syntax-case stx ()
-    [(_ . EXPRS)
-     #`(module+ test
-         (require #,(datum->syntax stx 'rackunit) #,(datum->syntax stx 'racket/serialize)) 
-         . EXPRS)]))
-
-
-(define (is-mark? codepoint)
-  ;; mark classes = Mn Me Mc
-  (regexp-match #px"\\p{Mn}|\\p{Me}|\\p{Mc}" (string (integer->char codepoint))))
-
-(module+ test
-  (require rackunit)
-  (check-true (and (is-mark? #x300) #t))
-  (check-false (and (is-mark? #x2ee) #t)))
\ No newline at end of file
+(define-runtime-path charter-italic-directory-path "assets/charter-italic-directory.rktd")
\ No newline at end of file
diff --git a/fontland/fontland/subset.rkt b/fontland/fontland/subset.rkt
index 03aafe87..42bfe26d 100644
--- a/fontland/fontland/subset.rkt
+++ b/fontland/fontland/subset.rkt
@@ -1,10 +1,8 @@
 #lang debug racket/base
 (require racket/serialize
-         racket/class
          racket/list
          racket/match
          sugar/unstable/dict
-         sugar/unstable/js
          "table/loca.rkt"
          "table-stream.rkt"
          "directory.rkt"
diff --git a/fontland/fontland/table-stream.rkt b/fontland/fontland/table-stream.rkt
index 5ffc18cd..ee6b3e7e 100644
--- a/fontland/fontland/table-stream.rkt
+++ b/fontland/fontland/table-stream.rkt
@@ -1,6 +1,5 @@
 #lang debug racket
-(require sugar/unstable/js
-         xenomorph
+(require xenomorph
          "tables.rkt"
          "struct.rkt"
          (for-syntax "tables.rkt"))
diff --git a/fontland/fontland/table/loca.rkt b/fontland/fontland/table/loca.rkt
index 530d9b07..cdec3f81 100644
--- a/fontland/fontland/table/loca.rkt
+++ b/fontland/fontland/table/loca.rkt
@@ -4,7 +4,7 @@
          racket/list
          racket/promise
          "../struct.rkt")
-(provide loca)
+(provide loca loca-pre-encode loca-post-decode)
 
 (define 16bit-style 0)
 (define 32bit-style 1)
diff --git a/fontland/fontland/ttf-glyph.rkt b/fontland/fontland/ttf-glyph.rkt
index 52b9fc41..1e8c70c7 100644
--- a/fontland/fontland/ttf-glyph.rkt
+++ b/fontland/fontland/ttf-glyph.rkt
@@ -2,12 +2,8 @@
 (require (for-syntax racket/base)
          racket/match
          racket/list
-         racket/class
          racket/dict
-         "glyph.rkt"
          "struct.rkt"
-         sugar/unstable/dict
-         sugar/unstable/js
          xenomorph
          racket/struct)
 (provide (all-defined-out))