diff --git a/4-4_marches/cabar_feidh/drums.cmpd.ly b/4-4_marches/cabar_feidh/drums.cmpd.ly
deleted file mode 100644
index 3078bdb..0000000
--- a/4-4_marches/cabar_feidh/drums.cmpd.ly
+++ /dev/null
@@ -1,103 +0,0 @@
-\version "2.19.0"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-%\include "./notes.bass.ily"
-%\include "./notes.tenor.ily"
-\include "../../standards/standards.tenor.ily"
-\include "./notes.side.ily"
-\include "../../standards/24_44_standards.side.ily"
-
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-\score {
-	\new StaffGroup <<
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup{ \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
-			\global
-			\sideglobal
-			<<
-				%\new NullVoice = "format" {
-				%  \repeat unfold 4 {
-				%	\repeat unfold 2 {
-				%	  \part s1*2
-				%	} \alternative {
-				%	  { s1*2 }
-				%	  { s1*2 }
-				%	}
-				% }
-				%}%Format
-				
-				\new DrumVoice = "side" {
-					\partial 8 \simpleSnarepone \midone \simpleSnarepone \simpleSnareEndingI r8
-					\tutti { \simpleSnarepone \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-					\bar "||"
-					\break
-
-					\partial 8 \simpleSnareptwo \midone \simpleSnareptwo \simpleSnareEndingI r8
-					\tutti { \simpleSnareptwo \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-					\bar "||"
-					\break
-
-					\partial 8 \simpleSnarepthree \midone \simpleSnarepthree \simpleSnareEndingI r8
-					\tutti { \simpleSnarepthree \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-					\bar "||"
-					\break
-
-					\partial 8 \simpleSnarepfour \midone \simpleSnarepfour \simpleSnareEndingI r8
-					\tutti { \simpleSnarepfour \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-					\bar "|."
-				}
-			>>
-		}
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-
-		}
-%{
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass}
-		} {
-			\bassglobal
-
-		}
-%}
-	>>
-	\header {
-		title = \title
-		meter = \meter
-		composer = \markup {
-			\column \right-align {
-				$(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=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}
diff --git a/4-4_marches/cabar_feidh/full.cmpd.ly b/4-4_marches/cabar_feidh/full.cmpd.ly
deleted file mode 100644
index df92f32..0000000
--- a/4-4_marches/cabar_feidh/full.cmpd.ly
+++ /dev/null
@@ -1,141 +0,0 @@
-\version "2.19.0"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "./config.ily"
-%\include "./notes.bass.ily"
-%\include "./notes.tenor.ily"
-\include "./notes.side.ily"
-\include "../../standards/24_44_standards.side.ily"
-\include "../../standards/standards.tenor.ily"
-\include "./notes.pipes.ily"
-%\include "./notes.pipes.seconds.ily"
-%\include "./notes.lyrics.ily"
-
-\layout {
-	indent = 5.0
-	short-indent = 2.0
-}
-
-#(set-global-staff-size 17)
-\score {
-	\new StaffGroup <<
-		\new Staff \with {
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
-			\global
-			\pipeglobal
-			<<
-				\new NullVoice = "format" {
-					\repeat unfold 4 {
-						\part
-						\line
-						\bar "||"
-					 	\break
-					}
-				}%Format
-
-				\new Voice = "pipes" {
-					\pipesA s8
-
-					\pipesB s8
-
-					\pipesC s8
-
-					\pipesD s8
-				}%Pipes
-			>>
-		}
-%{		\new Staff = "song" {
-  			\lyricsglobal
-			\new Voice = "lyrics" {
-
-			}
-		}
-}%
-%{		\new Lyrics = "verse1" {
-		  \lyricsglobal
-		  \lyricsto "lyrics" {
-			\verseA
-		  }
-		}
-%}
-%{		\new Staff = "seconds" \with {
-			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
-		} {
-			\pipessecndglobal
-
-		}
-%}
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup { \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
-			\sideglobal
-
-			\simpleSnarepone \midone \simpleSnarepone \simpleSnareEndingI r8
-			\tutti { \simpleSnarepone \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-
-			\simpleSnareptwo \midone \simpleSnareptwo \simpleSnareEndingI r8
-			\tutti { \simpleSnareptwo \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-
-			\simpleSnarepthree \midone \simpleSnarepthree \simpleSnareEndingI r8
-			\tutti { \simpleSnarepthree \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-			
-			\simpleSnarepfour \midone \simpleSnarepfour \simpleSnareEndingI r8
-			\tutti { \simpleSnarepfour \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-
-
-		}
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-				
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-				
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-				
-				s8 \tenorFourfoursOneA
-				\tenorFourfoursOneB
-		}
-%{
-		\new PipeBandDrumStaff = "bass" \with {
-			instrumentName = \markup{ \instrumentBass }
-			shortInstrumentName = \markup{ \shortInstrumentBass }
-		} {
-			\bassglobal
-
-		}
-%}
-	>>
-	\header {
-		title = \title
-		meter = \meter
-		composer = \markup \large {
-			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
-				$(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=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
-				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}
diff --git a/4-4_marches/cabar_feidh/full.ly b/4-4_marches/cabar_feidh/full.ly
index 395c8cd..5e7e598 100644
--- a/4-4_marches/cabar_feidh/full.ly
+++ b/4-4_marches/cabar_feidh/full.ly
@@ -7,7 +7,6 @@
 %\include "./notes.bass.ily"
 %\include "./notes.tenor.ily"
 \include "./notes.side.ily"
-\include "../../standards/24_44_standards.side.ily"
 \include "./notes.pipes.ily"
 %\include "./notes.pipes.seconds.ily"
 %\include "./notes.lyrics.ily"
@@ -28,7 +27,14 @@
 			\pipeglobal
 			<<
 				\new NullVoice = "format" {
-					\repeat unfold 4 {
+					\repeat unfold 2 {
+						\part
+						\line
+						\bar "||"
+					 	\break
+					}
+					\pageBreak
+					\repeat unfold 2 {
 						\part
 						\line
 						\bar "||"
@@ -75,19 +81,17 @@
 		} {
 			\sideglobal
 
-			\simpleSnarepone \midone \simpleSnarepone \simpleSnareEndingI r8
-			\tutti { \simpleSnarepone \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+			\snareAA r8
+			\snareAB s8
 
-			\simpleSnareptwo \midone \simpleSnareptwo \simpleSnareEndingI r8
-			\tutti { \simpleSnareptwo \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-
-			\simpleSnarepthree \midone \simpleSnarepthree \simpleSnareEndingI r8
-			\tutti { \simpleSnarepthree \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
-			
-			\simpleSnarepfour \midone \simpleSnarepfour \simpleSnareEndingI r8
-			\tutti { \simpleSnarepfour \removeWithTag #'tutti \midone \simpleSnareEndingII s8 }
+			\snareBA r8
+			\snareBB s8
 
+			\snareCA r8
+			\snareCB s8
 
+			\snareDA r8
+			\snareDB s8
 		}
 %{
 		\new PipeBandDrumStaff = "tenor" \with {
diff --git a/4-4_marches/cabar_feidh/tenor.cmpd.ly b/4-4_marches/cabar_feidh/tenor.cmpd.ly
deleted file mode 100644
index 8d5c03b..0000000
--- a/4-4_marches/cabar_feidh/tenor.cmpd.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-\include "./config.ily"
-\include "../../standards/standards.tenor.ily"
-
-\score {
-    \new PipeBandDrumStaff {
-		\global
-		\new DrumVoice = "tenor" {
-				\repeat volta 2 {
-					\tenorFourfoursOneA
-					\bar "||"
-					\break
-					\tenorFourfoursOneB
-				}
-		}
-	}
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentTenor
-	}
-}