stanzas, refren advise

[Matevz Jekovec]

Could someone look at my file (and compile it) please and advice me how 
to solve stanzas of this kind of scores:
The first 8 measures are sung only once. In the 9th measure, a Repeat 
bar is opened and there are 3 repeats (3 stanzas) from the repeat bar 
till the end of score. Now, I made 3 stanzas throughout the whole score, 
but the first and the last are empty for the first 8 measures. However, 
a noticable white space occurs in their place. I tried 
\removeEmptyStaves, but there's no difference. Any way to get rid of 
that space or to find a different solution?

- Matevz

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%                                  %
%   LilyPond output generated by   %
%           "noteedit"             %
%                                  %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\version "2.4.0"

#(set-global-staff-size 17.2)

\header {
    title = "Every time I feel the spirit"
    composer = "unknown author"
    poet = "Traditional, Spiritual"
}

StaffAVoiceA = \relative c' { \voiceOne
    \clef violin
    \key es \major
    \time 4/4
    \partial 4

    \autoBeamOff

    \times 2/3 { es'8^\markup{"" \raise #2.0 \large\bold Moderato} es d  } | c4 
c2 es8 c |   % 3
    bes4 bes2 c8 bes | g f es2 es8 f |   % 5
    es2. \breathe es'8 d | c4 c2 es8 c |   % 7
    bes4 bes2 c8 bes | g f es2 es8 f |   % 9
    es2. \bar "|:" c8 es | g4 g2 c,8 es |   % 11
    g2. c,8 es | g4 g2 f8 g |   % 13
    es2. \breathe es'8 d | c4 c2 es8 c |   % 15
    bes4 bes2 c8 bes | g f es2 es8 f |   % 17
    es2. \breathe es'8 d | c4 c2 es8 c |   % 19
    bes4 bes2 c8 bes | g f es2 es8 f |   % 21
    es2.\fermata
    \bar ":|"
}
StaffAVoiceB = \relative c' { \voiceTwo
    \autoBeamOff

    \times 2/3 { g'8 as bes  } es,4 es2 as8 es es4 es2 g8 g es d c2 es8 d bes2. 
g'8 g es4 es2 g8 es es4 es2 g8 g es d c2 es8 d bes2. c8 es es4 es2 c8 es f2. c8 
es es4 es2 d8 d bes2. g'8 g es4 es2 as8 es es4 es2 g8 g es d c2 es8 d bes2. g'8 
g es4 es2 as8 es es4 es2 g8 g es d c2 es8 d bes4  ( c bes\fermata )
}
StaffA = \simultaneous {
    #(set-accidental-style 'modern-cautionary)
    \context Voice="StaffAVoiceA" \StaffAVoiceA
    \context Voice="StaffAVoiceB" \StaffAVoiceB
}

LyricsStanzaI = \lyricmode {
            _ _ _ _ _ _ _ _ _ _
            _ _ _ _ _ _ _ _ _ _
            _ _ _ _ _ _ _ _ _ _
            _ _ _

            \set stanza = "1. "

            On the Moun -- tain my Lord
            spoke, Out His mouth came fire and
            smoke.
            _ _ _ _ _ _ _ _ _ _
}

LyricsStanzaII = \lyricmode {
        Yes, ev -- 'ry time I feel the
        spir -- it mov -- ing in my heart, I will
        pray, Ev -- 'ry time I feel the
        spir -- it mov -- ing in my heart, I will
        pray.

        \set stanza = "2. "

        All a -- round me looks so
        fine, Ask my Lord if all was
        mine. Ev -- 'ry time I feel the
        spir -- it mov -- ing in my heart, I will
        pray, ev -- 'ry time I feel the
        spir -- it mov -- ing in my heart, I will
        pray. __
}

LyricsStanzaIII = \lyricmode {
        _ _ _ _ _ _ _ _ _ _
        _ _ _ _ _ _ _ _ _ _
        _ _ _ _ _ _ _ _ _ _
        _ _ _

        \set stanza = "3. "

        Jor -- dan Riv -- er, chilly and
        cold, Chills the bod -- y, not the
        soul.
        _ _ _ _ _ _ _ _ _ _
}


StaffBVoiceA = \relative c { \voiceOne
    \clef bass
    \key es \major
    \time 4/4
    \partial 4

    \autoBeamOff

    \times 2/3 { bes'8 bes bes  } | as4 as2 c8 as |   % 3
    g4 g2 bes8 bes | bes as g2 as8 as |   % 5
    g2. \breathe bes8 bes | as4 as2 c8 as |   % 7
    g4 g2 bes8 bes | bes as g2 as8 as |   % 9
    g2. \bar "|:" \break g8 g | g4 g2 g8 g |   % 11
    b!2. g8 g | g4 g2 as8 as |   % 13
    g2. \breathe bes8 bes | as4 as2 c8 as |   % 15
    g4 g2 bes8 bes | bes as g2 as8 as |   % 17
    g2. \breathe bes8 bes | as4 as2 c8 as |   % 19
    g4 g2 bes8 bes | bes as g2 as8 as |   % 21
    g4  ( as g\fermata )
    \bar ":|"
}
StaffBVoiceB = \relative c { \voiceTwo
    \autoBeamOff

    \times 2/3 { es8 f g  } as,4 as2 as8 as es'4 es2 es8 es bes b! c2 ces!8 bes 
es2. es8 es as,4 as2 as8 as es'4 es2 es8 es bes b! c2 ces!8 bes! es2. es8 c c4 
c2 es8 c g2. es'8 c c4 c2 bes8 bes es2. es8 es as,4 as2 as8 as es'4 es2 es8 es 
bes b! c2 ces!8 bes es2. es8 es as,4 as2 as8 as es'4 es2 es8 es bes b! c2 ces!8 
bes es2.\fermata
}
StaffB = \simultaneous {
    #(set-accidental-style 'modern-cautionary)
    \context Voice="StaffBVoiceA" \StaffBVoiceA
    \context Voice="StaffBVoiceB" \StaffBVoiceB
}
\score {
    \simultaneous {
        \set Score.skipBars = ##t
        \set Score.melismaBusyProperties = #'(melismaBusy slurMelismaBusy 
tieMelismaBusy)
        \context ChoirStaff
        <<
            \context Staff="StaffA" \StaffA
            \context Lyrics = LyricsStanzaI \lyricsto StaffAVoiceA 
\LyricsStanzaI
            \context Lyrics = LyricsStanzaII \lyricsto StaffAVoiceA 
\LyricsStanzaII
            \context Lyrics = LyricsStanzaIII \lyricsto StaffAVoiceA 
\LyricsStanzaIII
            \context Staff="StaffB" \StaffB
        >>
    }
    \layout {
        linewidth = 170.000 \mm
        textheight = 250.000 \mm
        \context { \RemoveEmptyStaffContext }
    }
}