diff --git a/developer/src/ext/Makefile b/developer/src/ext/Makefile
index c3b9206ce0..292430f978 100644
--- a/developer/src/ext/Makefile
+++ b/developer/src/ext/Makefile
@@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=browse4folder mbcolor scfontcombobox common
+TARGETS=browse4folder jedi mbcolor scfontcombobox common
 !endif
 
 CLEANS=
@@ -20,6 +20,10 @@ browse4folder: .virtual
     cd $(DEVELOPER_ROOT)\src\ext\browse4folder
     $(MAKE) $(TARGET)
 
+jedi: .virtual
+    cd $(DEVELOPER_ROOT)\src\ext\jedi
+    $(MAKE) $(TARGET)
+
 mbcolor: .virtual
     cd $(DEVELOPER_ROOT)\src\ext\mbcolor
     $(MAKE) $(TARGET)
diff --git a/windows/src/ext/jcl.txt b/developer/src/ext/jcl.txt
similarity index 75%
rename from windows/src/ext/jcl.txt
rename to developer/src/ext/jcl.txt
index 4555b56674..a962962d66 100644
--- a/windows/src/ext/jcl.txt
+++ b/developer/src/ext/jcl.txt
@@ -2,8 +2,8 @@ Keyman Third Party Package Readme: JCL
 =======================================
 
 Name:              JCL
-Purpose:           Various libraries for Delphi -- used for exception management
-Source:            
+Purpose:           Various libraries for Delphi -- used only for docking components in TIKE
+Source:
 Version:           28 Feb 2017
 License:           MPL 1.1
 Updated for:       Delphi 10.1 Berlin
@@ -15,7 +15,7 @@ Include Paths:     $(EXT)\jcl\jcl\source\common;$(EXT)\jcl\jcl\source\include;$(
 Installation notes
 ------------------
 
-Download from site above. 
+Download from site above.
 
 Build notes
 -----------
@@ -23,5 +23,8 @@ Build notes
 No package required; relevant files are included by each project. Extraneous files removed to make repository smaller; only source included.
 Could remove additional source files, e.g. zlib, etc.
 
+NOTE: we have removed the majority of files from this library, as they are unused,
+and as we continue to deprecate use of Delphi.
+
 License - MPL 1.1
 ----------------
diff --git a/developer/src/ext/jedi/Makefile b/developer/src/ext/jedi/Makefile
new file mode 100644
index 0000000000..7d0c855c17
--- /dev/null
+++ b/developer/src/ext/jedi/Makefile
@@ -0,0 +1,51 @@
+#
+# jedi Makefile (Keyman project)
+#
+# We have made our own copy of package files from the JEDI project
+# in the Packages folder. If we upgrade to a new version of Delphi,
+# we may need to update these package files. This was the easiest
+# way to support Delphi Starter, which does not have commmand line
+# build, and so we could control the output path of the packages.
+#
+
+!include ..\..\Defines.mak
+
+build: dirs
+    $(MAKE) install-paths
+    $(MAKE) build-jvcl-docking
+    $(MAKE) install-packages
+
+build-jvcl-docking:
+    cd $(DEVELOPER_ROOT)\src\ext\jedi\packages
+    @-mkdir obj\Win32\$(TARGET_PATH)
+    $(DCC32DPK) Jcl.dpk
+    $(DCC32DPK) JclVcl.dpk
+    $(DCC32DPK) JvCore.dpk
+    $(DCC32DPK) JvCoreDesign.dpk
+    $(DCC32DPK) JvDocking.dpk
+    $(DCC32DPK) JvDockingDesign.dpk
+
+install: install-paths install-packages
+
+install-paths:
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi
+
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jcl\jcl\source\common
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jcl\jcl\source\include
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jcl\jcl\source\vcl
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jcl\jcl\source\windows
+
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jvcl\jvcl\common
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jvcl\jvcl\resources
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\jvcl\jvcl\run
+
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\jedi\packages
+
+install-packages:
+    $(DEVTOOLS) -ip $(OUTLIB)\JvCoreDesign.bpl
+    $(DEVTOOLS) -ip $(OUTLIB)\JvDockingDesign.bpl
+
+clean:
+    rem
+
+!include ..\..\Target.mak
diff --git a/windows/src/ext/Makefile b/windows/src/ext/Makefile
index b011ba798e..eb325cbf68 100644
--- a/windows/src/ext/Makefile
+++ b/windows/src/ext/Makefile
@@ -7,11 +7,9 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=common jedi cef4delphi
+TARGETS=common cef4delphi
 !endif
 
-# jedi has no packages
-
 CLEANS=
 
 !include ..\Header.mak
@@ -28,14 +26,6 @@ cef4delphi: .virtual
     cd $(ROOT)\src\ext\cef4delphi
     $(MAKE) $(TARGET)
 
-jedi: .virtual
-    cd $(ROOT)\src\ext\jedi
-    $(MAKE) $(TARGET)
-
-vclzip: .virtual
-    cd $(ROOT)\src\ext\vclzip
-    $(MAKE) $(TARGET)
-
 #
 #
 #
diff --git a/windows/src/ext/jedi.txt b/windows/src/ext/jedi.txt
deleted file mode 100644
index 2cae8be08a..0000000000
--- a/windows/src/ext/jedi.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Keyman Third Party Package Readme: JEDI
-=======================================
-
-Name:              JEDI
-Purpose:           Various libraries for Delphi, including Windows API wrappers
-Source:            
-Version:           1.68
-License:           MPL 1.1
-Updated for:       ?
-Documentation:     C:\keyman\10.0\src\ext\jedi\jwscl\branches\0.9.3\documentation
-Download location: http://sourceforge.net/projects/jedi-apilib
-Licensed For:      Unlimited developers
-Include Paths:     ?
-
-Installation notes
-------------------
-
-Download from site above. 
-
-Build notes
------------
-
-No package required; relevant files are included by each project.
-
-License - MPL 1.1
-----------------
diff --git a/windows/src/ext/jedi/Makefile b/windows/src/ext/jedi/Makefile
index 307a3a876b..2765a30952 100644
--- a/windows/src/ext/jedi/Makefile
+++ b/windows/src/ext/jedi/Makefile
@@ -1,67 +1,18 @@
 #
-# jedi Makefile (Keyman project)
-#
-# We have made our own copy of package files from the JEDI project
-# in the Packages folder. If we upgrade to a new version of Delphi,
-# we may need to update these package files. This was the easiest
-# way to support Delphi Starter, which does not have commmand line
-# build, and so we could control the output path of the packages.
+# jedi/jwa Makefile (Keyman project)
 #
 
 !include ..\..\Defines.mak
 
 build: dirs
     $(MAKE) install-paths
-    $(MAKE) build-jvcl-docking
-#$(MAKE) build-jcldbg
-    $(MAKE) install-packages
 
-build-jcldbg:
-  rem
-# This needs to be called separately so we get the updated include path jedi-includes
-# It also needs to be called after make install
-#    cd $(EXT)\jedi\jcl\jcl\examples\windows\debug\tools
-
-# We use a direct build to ignore platform warnings
-# as we don't control the source of this code
-
-#    $(MAKEDIR)\dcc32.exe $(DELPHIDPRPARAMS) makejcldbg.dpr
-#    $(COPY) makejcldbg.exe $(PROGRAM)\buildtools
-
-build-jvcl-docking:
-    cd $(EXT)\jedi\packages
-    @-mkdir obj\Win32\$(TARGET_PATH)
-    $(DCC32DPK) Jcl.dpk
-    $(DCC32DPK) JclVcl.dpk
-    $(DCC32DPK) JvCore.dpk
-    $(DCC32DPK) JvCoreDesign.dpk
-    $(DCC32DPK) JvDocking.dpk
-    $(DCC32DPK) JvDockingDesign.dpk
-
-install: install-paths install-packages
+install: install-paths
 
 install-paths:
-    $(DEVTOOLS) -ai $(EXT)\jedi
-
-    $(DEVTOOLS) -ai $(EXT)\jedi\jcl\jcl\source\common
-    $(DEVTOOLS) -ai $(EXT)\jedi\jcl\jcl\source\include
-    $(DEVTOOLS) -ai $(EXT)\jedi\jcl\jcl\source\vcl
-    $(DEVTOOLS) -ai $(EXT)\jedi\jcl\jcl\source\windows
-
-    $(DEVTOOLS) -ai $(EXT)\jedi\jvcl\jvcl\common
-    $(DEVTOOLS) -ai $(EXT)\jedi\jvcl\jvcl\resources
-    $(DEVTOOLS) -ai $(EXT)\jedi\jvcl\jvcl\run
-
     $(DEVTOOLS) -ai $(EXT)\jedi\jwa\branches\2.3\Win32API
 
-    $(DEVTOOLS) -ai $(EXT)\jedi\packages
-
-install-packages:
-    $(DEVTOOLS) -ip $(OUTLIB)\JvCoreDesign.bpl
-    $(DEVTOOLS) -ip $(OUTLIB)\JvDockingDesign.bpl
-
 clean:
-    cd $(EXT)\jedi\jcl\jcl\examples\windows\debug\tools
-    -del *.exe
+    rem
 
 !include ..\..\Target.mak
diff --git a/windows/src/ext/jedi/subversion.txt b/windows/src/ext/jedi/subversion.txt
deleted file mode 100644
index fef23e7168..0000000000
--- a/windows/src/ext/jedi/subversion.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The files in
-jwa\branches\2.3 and jwscl\branches\0.9.3
-are subversion aware. You can update them using a Subversion client (like TortoiseSVN).