diff --git a/Schubert_StabatMater_D383.ly b/Schubert_StabatMater_D383.ly
index 9e2e2c59daa0d56c0bf5c42024e2f04b8eb60206..0d55c44e0be04a4aeebf4b76e5eef077ac7fdfa5 100644
--- a/Schubert_StabatMater_D383.ly
+++ b/Schubert_StabatMater_D383.ly
@@ -1,20 +1,7 @@
 \version "2.11.35"
 \include "Schubert_StabatMater_D383_Settings_FullScore.ly"
 \paper {
-%   #(set! write-page-layout #f)
-   #(define (page-post-process layout pages)
-      (let ((label-table (ly:output-def-lookup layout 'label-page-table)))
-        (display (toc-items))
-        (format #t "~{~%~a~}"
-          (map (lambda (toc-item)
-                 (let* ((label (car toc-item))
-                        (text  (caddr toc-item))
-                        (type  (cadr toc-item)) ;; more work to do here
-                        (label-page (and (list? label-table) (assoc label label-table)))
-                        (page (and label-page (cdr label-page))))
-                   (format #f "~a, \"~a\", 1, ~s, ~a"
-                     page type text label)))
-               (toc-items)))))
+   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
 }
 
 \markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Ch.ly b/Schubert_StabatMater_D383_Ch.ly
index ee63f2127bd8853a8ed4edf4874cc02ac93b3b03..8d297bc7f1e68fc37912b17266f26e01b49f3db4 100644
--- a/Schubert_StabatMater_D383_Ch.ly
+++ b/Schubert_StabatMater_D383_Ch.ly
@@ -6,6 +6,7 @@
 
 \paper {
     bottom-margin = 1.1\cm
+   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
 }
 \layout {
   \context { \Staff
@@ -23,7 +24,6 @@
 \createScore #"IChor" #'("Ch")
 \createNoCuesScore #"IIArie" #'("Ch")
 \createScore #"IIIChor" #'("Ch")
-% \pageBreak
 \createNoCuesScore #"IVDuett" #'("Ch")
 \createNoCuesScore #"VChor" #'("Ch")
 \createNoCuesScore #"VIArie" #'("Ch")
diff --git a/Schubert_StabatMater_D383_LongScore.ly b/Schubert_StabatMater_D383_LongScore.ly
index 726a5c93bdff0be779b4fc81bc67b1e4c332f420..ef7c850225bab030ed579f46710176208410a1bc 100644
--- a/Schubert_StabatMater_D383_LongScore.ly
+++ b/Schubert_StabatMater_D383_LongScore.ly
@@ -10,6 +10,7 @@
 
 \paper {
   bottom-margin = 1\cm
+   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
 }
 \layout {
   \context { \Staff
diff --git a/Schubert_StabatMater_D383_SoloCh.ly b/Schubert_StabatMater_D383_SoloCh.ly
index 178763150806693c52ad1de55b4a25704fa723cb..2de64ed3d21a967e3f1762d8d18decf5d990a413 100644
--- a/Schubert_StabatMater_D383_SoloCh.ly
+++ b/Schubert_StabatMater_D383_SoloCh.ly
@@ -29,23 +29,14 @@ XITerzettChorBSettings = { \XITerzettChorSettings \override Staff.VerticalAxisGr
 \markup \commentsInstrMarkup
 \createScore #"IChor" #'("Vocal")
 \createScore #"IIArie" #'("Vocal")
-% \pageBreak
 \createScore #"IIIChor" #'("Vocal")
-
-% % \pageBreak
 \createScore #"IVDuett" #'("Vocal")
-% %\pageBreak
 \createNoCuesScore #"VChor" #'("Vocal")
 \createScore #"VIArie" #'("Vocal")
 \createNoCuesScore #"VIIChor" #'("Vocal")
-% % \pageBreak
 \createScore #"VIIIArie" #'("Vocal")
-% % \pageBreak
 \createNoCuesScore #"IXChor" #'("Vocal")
-% \pageBreak
 \createScore #"XTerzett" #'("Vocal")
 \createNoCuesScore #"XITerzettChor" #'("Vocal")
-% \pageBreak
 \createNoCuesScore #"XIIChor" #'("Vocal")
 
-#(ly:set-option 'debug-skylines #t)