diff --git a/doc/environments/groupthm/groupthm.dtx b/doc/environments/groupthm/groupthm.dtx
index fafe93c..8c57f15 100644
--- a/doc/environments/groupthm/groupthm.dtx
+++ b/doc/environments/groupthm/groupthm.dtx
@@ -1,4 +1,15 @@
 % \iffalse meta-comment
+%<*internal>
+\begingroup
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/mkessler/groupthm}
+\askforoverwritefalse
+\generate{\file{groupthm.sty}{\from{groupthm.dtx}{package}}}
+\def\tmpa{plain}
+\ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
+\endgroup
+%</internal>
 %
 %% File: groupthm.dtx
 %
@@ -16,7 +27,6 @@
 %
 %<*driver>
 \documentclass[full,kernel]{l3doc}
-\usepackage{mkessler-todo}
 \begin{document}
   \DocInput{\jobname.dtx}
 \end{document}
@@ -746,7 +756,9 @@
 %   \texttt{unnumbered} group.
 %
 % \end{function}
-
+% 
+% 
+% 
 % \begin{function}
 % {
 %   \groupthm_new_family:nnnnn, \groupthm_provide_family:nnnnn,
@@ -1614,8 +1626,8 @@
 % With the \cs{@@_set_normalized_keys:nnn} macro at hand,
 % it is also easy to provide key-value interfaces for these commands:
 %
-
-
+%
+%
 % \begin{macro}{\@@_wrap_multiple:nnn}
 %    \begin{syntax}
 %       \cs{@@_wrap_multiple:nnn}\marg{declarator list}\marg{function name}\marg{code}
@@ -1638,7 +1650,7 @@
   }
 %    \end{macrocode}
 % \end{macro}
-
+%
 % \begin{macro}
 %   {
 %     \groupthm_new_group:nn,
@@ -1763,7 +1775,9 @@
 \cs_generate_variant:Nn \groupthm_declare_group_rule:nnnn { n n n x }
 %    \end{macrocode}
 % \end{macro}
-
+%
+%
+%
 % \begin{macro}{\DeclareTheoremGroupRule}
 %    \begin{syntax}
 %      \cs{DeclareTheoremGroupRule}\oarg{keyname}%
@@ -1823,7 +1837,7 @@
 %     
 %
 %    \begin{macrocode}
-
+%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1884,8 +1898,8 @@
 %    \end{macrocodel}
 % \end{macro}
 % 
-
-
+%
+%
 % \begin{macro}{\AppendToTheoremGroup}
 %    \begin{syntax}
 %       \cs{AppendToTheoremGroup} \marg{key=value list}\marg{theorem group}
@@ -1900,8 +1914,8 @@
   }
 %    \end{macrocode}
 % \end{macro}
-
-
+%
+%
 %   We also provide the three default groups:
 % 
 %    \begin{macrocode}
@@ -1941,14 +1955,18 @@
         \clist_get:NN \l__powerset_copied_clist \l_tmpa_tl
         \seq_push:NV  \l__powerset_saved_seq \l_tmpa_tl
         \clist_pop:NN \l__powerset_copied_clist { \l_tmpa_tl }
-
+%    \end{macrocode}
+%    \begin{macrocode}
         \__powerset_clist_foreach_aux:Nn #1 {#2}
-        
+%    \end{macrocode}
+%    \begin{macrocode}
         \seq_get:NN \l__powerset_saved_seq \l_tmpa_tl
         \clist_put_left:NV #1 \l_tmpa_tl
-
+%    \end{macrocode}
+%    \begin{macrocode}
         \__powerset_clist_foreach_aux:Nn #1 {#2}
-
+%    \end{macrocode}
+%    \begin{macrocode}
         \seq_get:NN \l__powerset_saved_seq \l_tmpa_tl
         \clist_remove_all:NV #1 \l_tmpa_tl
         \clist_push:NV \l__powerset_copied_clist \l_tmpa_tl
diff --git a/doc/environments/groupthm/groupthm.ins b/doc/environments/groupthm/groupthm.ins
deleted file mode 100644
index 89a4f4b..0000000
--- a/doc/environments/groupthm/groupthm.ins
+++ /dev/null
@@ -1,4 +0,0 @@
-\input docstrip.tex
-\keepsilent
-\generate{\file{groupthm.sty}{\from{groupthm.dtx}{package}}}
-\end