Update Amazing Grace Side notation

airs/amazing_grace/full.ly

@@ -8,7 +8,6 @@
 %\include "./notes.tenor.ily"
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
-\include "./notes.lyrics.ily"
 
 \layout {
 	indent = 5.0
@@ -24,7 +23,7 @@
 			\global
 			\pipeglobal
 			<<
-				\new Voice = "format" {
+				{
 					\part
 					\repeat volta 2 {
 					  \line \break
@@ -38,21 +37,13 @@
 					 }
 					 \bar "|."
 				}%Format
-				\new Voice = "pipes" {
+				{
 					\pipesA
 					\pipesAendA s4
 					\pipesAendB s4
 				}%Pipes
-				\new NullVoice = "lyrics-aligner" {
-					\lyricsA
-				}
 			>>
 		}
-		\new Lyrics = "lyrics1" {
-			\lyricsto  "lyrics-aligner" {
-				\verseA
-			}
-		}
 		\new PipeBandDrumStaff = "side" \with {
 			instrumentName = \markup { \instrumentSide }
 			shortInstrumentName = \markup{ \shortInstrumentSide }
@@ -64,7 +55,7 @@
 				\snareAB
 				\snareAC
 				\keepWithTag #'with-volta \snareAD
-				\snareADendB s4
+				\snareADendB
 		}
 %		\new PipeBandDrumStaff = "tenor" {
 %			\tenorglobal
@@ -84,20 +75,17 @@
 		meter = \meter
 		composer = \markup \large {
 			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  \arrangerPipes ":" }} #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
 			}
 			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
 				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
 				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
 				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
 				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
 			}
 		}
-
 	}
 }

airs/amazing_grace/notes.lyrics.ily

@@ -1,31 +0,0 @@
-% 4/4 Abide with Me
-% Lyrics
-\version "2.18.2"
-composerLyrics = "J. Newton"
-lyricsA = {
-	d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2~ d4~ | d2
-
-	d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2 d4 |
-	d2~ d4~ | d2
-}
-verseA = \lyricmode {
-	\set stanza = #"1."
-	A -- ma -- zing grace!
-	How sweet the sound, that saved a wretch like me! __ __
-
-	I once was lost, but now am found.
-	Was blind, but now I see. __ __
-}

airs/amazing_grace/notes.side.ily

@@ -1,8 +1,8 @@
 % 3/4 Amazing Grace
 % Side
 \version "2.18.2"
-composerSide = "v1.0"
-arrangerSide = ""
+composerSide = ""
+arrangerSide = "v1.0"
 sideglobal = {}
 
 optdragd = \drummode { \drumgrace { \startParenthesis g16[ \endParenthesis g] } } 
@@ -47,7 +47,7 @@ snareADendA = \drummode {
 }
 snareADendB = \drummode {
 	d2.:32( \f \>  |
-	d2:32)\p
+	d2.:32)\p
 }
 snareAD = \drummode {
 	\snareADA