diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt
index 230e15dc..96280930 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt
@@ -91,21 +91,15 @@
 (type-environment
  [application:current-app-name (-Param -String)]
  ;; 3 Autosave
- [autosave:autosavable<%> (parse-type #'Autosave:Autosavable<%>)]
  [autosave:register
   ((make-Instance (parse-type #'Editor<%>-And-Autosave:Autosavable<%>)) . -> . -Void)]
  [autosave:toc-path -Path]
  [autosave:restore-autosave-files/gui (-> -Void)]
  ;; 4 Canvas
- [canvas:basic<%> (parse-type #'Canvas:Basic<%>)]
  [canvas:basic-mixin (parse-type #'Canvas:Basic-Mixin)]
- [canvas:color<%> (parse-type #'Canvas:Color<%>)]
  [canvas:color-mixin (parse-type #'Canvas:Color-Mixin)]
- [canvas:delegate<%> (parse-type #'Canvas:Delegate<%>)]
  [canvas:delegate-mixin (parse-type #'Canvas:Delegate-Mixin)]
- [canvas:info<%> (parse-type #'Canvas:Info<%>)]
  [canvas:info-mixin (parse-type #'Canvas:Info-Mixin)]
- [canvas:wide-snip<%> (parse-type #'Canvas:Wide-Snip<%>)]
  [canvas:wide-snip-mixin (parse-type #'Canvas:Wide-Snip-Mixin)]
  [canvas:basic% (parse-type #'Canvas:Basic%)]
  [canvas:color% (parse-type #'Canvas:Color%)]
@@ -184,10 +178,8 @@
  [color-prefs:get-color-scheme-names
   (-> (-values (list (-set Univ) (-set Univ))))] ; TODO doc doesn't say set of what
  ;; 7 Color
- [color:text<%> (parse-type #'Color:Text<%>)]
  [color:text-mixin (parse-type #'Color:Text-Mixin)]
  [color:text% (parse-type #'Color:Text%)]
- [color:text-mode<%> (parse-type #'Color:Text-Mode<%>)]
  [color:text-mode-mixin (parse-type #'Color:Text-Mode-Mixin)]
  [color:text-mode% (parse-type #'Color:Text-Mode%)]
  [color:get-parenthesis-colors-table
@@ -202,24 +194,16 @@
  ;; 9 Decorated Editor Snip
  ; TODO: all syntax, and docs suggests they're deprecated?
  ;; 10 Editor Snip
- [editor-snip:decorated<%> (parse-type #'Editor-Snip:Decorated<%>)]
  [editor-snip:decorated-mixin (parse-type #'Editor-Snip:Decorated-Mixin)]
  [editor-snip:decorated% (parse-type #'Editor-Snip:Decorated%)]
  [editor-snip:decorated-snipclass% (parse-type #'Editor-Snip:Decorated-Snipclass%)]
   ;; 11 Editor
- [editor:basic<%> (parse-type #'Editor:Basic<%>)]
  [editor:basic-mixin (parse-type #'Editor:Basic-Mixin)]
- [editor:standard-style-list<%> (parse-type #'Editor:Standard-Style-List<%>)]
  [editor:standard-style-list-mixin (parse-type #'Editor:Standard-Style-List-Mixin)]
- [editor:keymap<%> (parse-type #'Editor:Keymap<%>)]
  [editor:keymap-mixin (parse-type #'Editor:Keymap-Mixin)]
- [editor:autowrap<%> (parse-type #'Editor:Autowrap<%>)]
  [editor:autowrap-mixin (parse-type #'Editor:Autowrap-Mixin)]
- [editor:file<%> (parse-type #'Editor:File<%>)]
  [editor:file-mixin (parse-type #'Editor:File-Mixin)]
- [editor:backup-autosave<%> (parse-type #'Editor:Backup-Autosave<%>)]
  [editor:backup-autosave-mixin (parse-type #'Editor:Backup-Autosave-Mixin)]
- [editor:info<%> (parse-type #'Editor:Info<%>)]
  [editor:info-mixin (parse-type #'Editor:Info-Mixin)]
  [editor:set-current-preferred-font-size (-Nat . -> . -Void)]
  [editor:get-current-preferred-font-size (-> -Nat)]
@@ -309,35 +293,20 @@
                     (-opt -Top-Level-Window<%>-Instance)]
                    (-opt -Path))]
  ;; 14 Frame
- [frame:basic<%> (parse-type #'Frame:Basic<%>)]
  [frame:basic-mixin (parse-type #'Frame:Basic-Mixin)]
- [frame:focus-table<%> (parse-type #'Frame:Focus-Table<%>)]
  [frame:focus-table-mixin (parse-type #'Frame:Focus-Table-Mixin)]
- [frame:size-pref<%> (parse-type #'Frame:Size-Pref<%>)]
  [frame:size-pref-mixin (parse-type #'Frame:Size-Pref-Mixin)]
- [frame:register-group<%> (parse-type #'Frame:Register-Group<%>)]
  [frame:register-group-mixin (parse-type #'Frame:Register-Group-Mixin)]
- [frame:status-line<%> (parse-type #'Frame:Status-Line<%>)]
  [frame:status-line-mixin (parse-type #'Frame:Status-Line-Mixin)]
- [frame:info<%> (parse-type #'Frame:Info<%>)]
  [frame:info-mixin (parse-type #'Frame:Info-Mixin)]
- [frame:text-info<%> (parse-type #'Frame:Text-Info<%>)]
  [frame:text-info-mixin (parse-type #'Frame:Text-Info-Mixin)]
- [frame:pasteboard-info<%> (parse-type #'Frame:Pasteboard-Info<%>)]
  [frame:pasteboard-info-mixin (parse-type #'Frame:Pasteboard-Info-Mixin)]
- [frame:standard-menus<%> (parse-type #'Frame:Standard-Menus<%>)]
  [frame:standard-menus-mixin (parse-type #'Frame:Standard-Menus-Mixin)]
- [frame:editor<%> -Frame:Editor<%>]
  [frame:editor-mixin (parse-type #'Frame:Editor-Mixin)]
- [frame:text<%> (parse-type #'Frame:Text<%>)]
  [frame:text-mixin (parse-type #'Frame:Text-Mixin)]
- [frame:pasteboard<%> (parse-type #'Frame:Pasteboard<%>)]
  [frame:pasteboard-mixin (parse-type #'Frame:Pasteboard-Mixin)]
- [frame:delegate<%> (parse-type #'Frame:Delegate<%>)]
  [frame:delegate-mixin (parse-type #'Frame:Delegate-Mixin)]
- [frame:searchable<%> (parse-type #'Frame:Searchable<%>)]
  [frame:searchable-mixin (parse-type #'Frame:Searchable-Mixin)]
- [frame:searchable-text<%> (parse-type #'Frame:Searchable-Text<%>)]
  [frame:searchable-text-mixin (parse-type #'Frame:Searchable-Text-Mixin)]
  [frame:basic% (parse-type #'Frame:Basic%)]
  [frame:size-pref% (parse-type #'Frame:Size-Pref%)]
@@ -461,7 +430,6 @@
  [icon:get-gc-on-bitmap (-> -Bitmap%-Instance)]
  [icon:get-gc-off-bitmap (-> -Bitmap%-Instance)]
  ;; 19 Keymap
- [keymap:aug-keymap<%> (parse-type #'Keymap:Aug-Keymap<%>)]
  [keymap:aug-keymap-mixin (parse-type #'Keymap:Aug-Keymap-Mixin)]
  [keymap:aug-keymap% (parse-type #'Keymap:Aug-Keymap%)]
  [keymap:remove-user-keybindings-file (Univ . -> . Univ)]
@@ -506,41 +474,29 @@
                        (-NonNegReal -Boolean -NonNegReal -NonNegReal . -> . Univ)
                        . -> . Univ)]
  ;; 20 Menu
- [menu:can-restore<%> (parse-type #'Menu:Can-Restore<%>)]
  [menu:can-restore-mixin (parse-type #'Menu:Can-Restore-Mixin)]
- [menu:can-restore-underscore<%> (parse-type #'Menu:Can-Restore-Underscore<%>)]
  [menu:can-restore-underscore-mixin (parse-type #'Menu:Can-Restore-Underscore-Mixin)]
  [menu:can-restore-menu-item% (parse-type #'Menu:Can-Restore-Menu-Item%)]
  [menu:can-restore-checkable-menu-item% (parse-type #'Menu:Can-Restore-Checkable-Menu-Item%)]
  [menu:can-restore-underscore-menu% (parse-type #'Menu:Can-Restore-Underscore-Menu%)]
  ;; 21 Mode
- [mode:surrogate-text<%> (parse-type #'Mode:Surrogate-Text<%>)]
  [mode:surrogate-text% (parse-type #'Mode:Surrogate-Text%)]
- [mode:host-text<%> (parse-type #'Mode:Host-Text<%>)]
  [mode:host-text-mixin (parse-type #'Mode:Host-Text-Mixin)]
  ;; 22 Number Snip
  [number-snip:snip-class% (parse-type #'Number-Snip:Snip-Class%)]
  [number-snip:make-repeating-decimal-snip (-Real -Boolean . -> . -Snip%-Instance)]
  [number-snip:make-fraction-snip (-Real -Boolean . -> . -Snip%-Instance)]
  ;; 23 Panel
- [panel:single<%> (parse-type #'Panel:Single<%>)]
  [panel:single-mixin (parse-type #'Panel:Single-Mixin)]
- [panel:single-window<%> (parse-type #'Panel:Single-Window<%>)]
  [panel:single-window-mixin (parse-type #'Panel:Single-Window-Mixin)]
  [panel:single% (parse-type #'Panel:Single%)]
  [panel:single-pane% (parse-type #'Panel:Single-Pane%)]
- [panel:dragable<%> (parse-type #'Panel:Dragable<%>)]
- [panel:vertical-dragable<%> (parse-type #'Panel:Vertical-Dragable<%>)]
- [panel:horizontal-dragable<%> (parse-type #'Panel:Horizontal-Dragable<%>)]
  [panel:dragable-mixin (parse-type #'Panel:Dragable-Mixin)]
  [panel:vertical-dragable-mixin (parse-type #'Panel:Vertical-Dragable-Mixin)]
  [panel:horizontal-dragable-mixin (parse-type #'Panel:Horizontal-Dragable-Mixin)]
  [panel:vertical-dragable% (parse-type #'Panel:Vertical-Dragable%)]
  [panel:horizontal-dragable% (parse-type #'Panel:Horizontal-Dragable%)]
- [panel:splitter<%> (parse-type #'Panel:Splitter<%>)]
  [panel:splitter-mixin (parse-type #'Panel:Splitter-Mixin)]
- [panel:discrete-sizes<%> (parse-type #'Panel:Discrete-Sizes<%>)]
- [panel:discrete-child<%> (parse-type #'Panel:Discrete-Child<%>)]
  [panel:discrete-sizes-mixin (parse-type #'Panel:Discrete-Sizes-Mixin)]
  [panel:horizontal-discrete-sizes% (parse-type #'Panel:Horizontal-Discrete-Sizes%)]
  [panel:vertical-discrete-sizes% (parse-type #'Panel:Vertical-Discrete-Sizes%)]
@@ -627,11 +583,8 @@
  [preferences:restore-prefs-snapshot (-Preferences:Snapshot . -> . -Void)]
  [preferences:get-prefs-snapshot (-> -Preferences:Snapshot)]
  ;; 28 Racket
- [racket:sexp-snip<%> (parse-type #'Racket:Sexp-Snip<%>)]
  [racket:sexp-snip% (parse-type #'Racket:Sexp-Snip%)]
- [racket:text<%> (parse-type #'Racket:Text<%>)]
  [racket:text-mixin (parse-type #'Racket:Text-Mixin)]
- [racket:text-mode<%> (parse-type #'Racket:Text-Mode<%>)]
  [racket:text-mode-mixin (parse-type #'Racket:Text-Mode-Mixin)]
  [racket:set-mode-mixin (parse-type #'Racket:Set-Mode-Mixin)]
  [racket:text% (parse-type #'Racket:Text%)]
@@ -650,45 +603,26 @@
  [racket:init-wordbreak-map (-Keymap%-Instance . -> . -Void)]
  [racket:setup-keymap (-Keymap%-Instance . -> . -Void)]
  ;; 29 Text
- [text:basic<%> (parse-type #'Text:Basic<%>)]
  [text:basic-mixin (parse-type #'Text:Basic-Mixin)]
- [text:line-spacing<%> (parse-type #'Text:Line-Spacing<%>)]
  [text:line-spacing-mixin (parse-type #'Text:Line-Spacing-Mixin)]
- [text:first-line<%> (parse-type #'Text:First-Line<%>)]
  [text:first-line-mixin (parse-type #'Text:First-Line-Mixin)]
- [text:foreground-color<%> (parse-type #'Text:Foreground-Color<%>)]
  [text:foreground-color-mixin (parse-type #'Text:Foreground-Color-Mixin)]
- [text:hide-caret/selection<%> (parse-type #'Text:Hide-Caret/Selection<%>)]
  [text:hide-caret/selection-mixin (parse-type #'Text:Hide-Caret/Selection-Mixin)]
- [text:nbsp->space<%> (parse-type #'Text:Nbsp->Space<%>)]
  [text:nbsp->space-mixin (parse-type #'Text:Nbsp->Space-Mixin)]
- [text:column-guide<%> (parse-type #'Text:Column-Guide<%>)]
  [text:column-guide-mixin (parse-type #'Text:Column-Guide-Mixin)]
- [text:normalize-paste<%> (parse-type #'Text:Normalize-Paste<%>)]
  [text:normalize-paste-mixin (parse-type #'Text:Normalize-Paste-Mixin)]
- [text:searching<%> (parse-type #'Text:Searching<%>)]
  [text:searching-mixin (parse-type #'Text:Searching-Mixin)]
- [text:return<%> (parse-type #'Text:Return<%>)]
  [text:return-mixin (parse-type #'Text:Return-Mixin)]
- [text:wide-snip<%> (parse-type #'Text:Wide-Snip<%>)]
  [text:wide-snip-mixin (parse-type #'Text:Wide-Snip-Mixin)]
- [text:delegate<%> (parse-type #'Text:Delegate<%>)]
  [text:1-pixel-string-snip% (parse-type #'Text:1-Pixel-String-Snip%)]
  [text:1-pixel-tab-snip% (parse-type #'Text:1-Pixel-Tab-Snip%)]
  [text:delegate-mixin (parse-type #'Text:Delegate-Mixin)]
- [text:info<%> (parse-type #'Text:Info<%>)]
  [text:info-mixin (parse-type #'Text:Info-Mixin)]
- [text:clever-file-format<%> (parse-type #'Text:Clever-File-Format<%>)]
  [text:clever-file-format-mixin (parse-type #'Text:Clever-File-Format-Mixin)]
- [text:crlf-line-endings<%> (parse-type #'Text:Crlf-Line-Endings<%>)]
  [text:crlf-line-endings-mixin (parse-type #'Text:Crlf-Line-Endings-Mixin)]
- [text:file<%> (parse-type #'Text:File<%>)]
  [text:file-mixin (parse-type #'Text:File-Mixin)]
- [text:ports<%> (parse-type #'Text:Ports<%>)]
  [text:ports-mixin (parse-type #'Text:Ports-Mixin)]
- [text:input-box<%> (parse-type #'Text:Input-Box<%>)]
  [text:input-box-mixin (parse-type #'Text:Input-Box-Mixin)]
- [text:autocomplete<%> (parse-type #'Text:Autocomplete<%>)]
  [text:autocomplete-mixin (parse-type #'Text:Autocomplete-Mixin)]
  [text:basic% (parse-type #'Text:Basic%)]
  [text:line-spacing% (parse-type #'Text:Line-Spacing%)]
@@ -707,7 +641,6 @@
  [text:backup-autosave% (parse-type #'Text:Backup-Autosave%)]
  [text:searching% (parse-type #'Text:Searching%)]
  [text:info% (parse-type #'Text:Info%)]
- [text:line-numbers<%> (parse-type #'Text:Line-Numbers<%>)]
  [text:line-numbers-mixin (parse-type #'Text:Line-Numbers-Mixin)]
  [#:opaque Text:Range text:range?]
  [text:range-start (-Text:Range . -> . -Nat)]
@@ -797,10 +730,8 @@
  [version:add-spec (Univ Univ . -> . -Void)]
  [version:version (-> -String)]
  ;; 33 Backwards Compatibility
- [scheme:text<%> (parse-type #'Racket:Text<%>)]
  [scheme:text-mixin (parse-type #'Racket:Text-Mixin)]
  [scheme:text% (parse-type #'Racket:Text%)]
- [scheme:text-mode<%> (parse-type #'Racket:Text-Mode<%>)]
  [scheme:text-mode-mixin (parse-type #'Racket:Text-Mode-Mixin)]
  [scheme:text-mode% (parse-type #'Racket:Text-Mode%)]
  [scheme:set-mode-mixin (parse-type #'Racket:Set-Mode-Mixin)]