10 files changed, 8 insertions, 37 deletions
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8de2efe4..8cc6c59d 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -127,8 +127,6 @@ uses UGraphic,
      USkins;
 
 function TScreenEditConvert.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
-var
-  T:    integer;
 begin
   Result := true;
   If (PressedDown) Then
diff --git a/src/screens/UScreenEditSub.pas b/src/screens/UScreenEditSub.pas
index 3eefc680..167d94b4 100644
--- a/src/screens/UScreenEditSub.pas
+++ b/src/screens/UScreenEditSub.pas
@@ -93,7 +93,6 @@ type
 
       Lyric:    TEditorLyrics;
 
-      procedure NewBeat;
       procedure DivideBPM;
       procedure MultiplyBPM;
       procedure LyricsCapitalize;
@@ -669,14 +668,15 @@ begin
   end;
 end;
 
+{
 procedure TScreenEditSub.NewBeat;
 begin
-    // click
-{    for Pet := 0 to Lines[0].Line[Lines[0].Current].HighNut do
-  if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = Czas.AktBeat) then begin
-      // old}
-//    Music.PlayClick;
+  // click
+  for Pet := 0 to Lines[0].Line[Lines[0].Current].HighNut do
+    if (Lines[0].Line[Lines[0].Current].Note[Pet].Start = Czas.AktBeat) then
+      Music.PlayClick;
 end;
+}
 
 procedure TScreenEditSub.DivideBPM;
 var
@@ -713,7 +713,7 @@ end;
 procedure TScreenEditSub.LyricsCapitalize;
 var
   C:    integer;
-  N:    integer; // temporary
+  //N:    integer; // temporary
   S:    string;
 begin
   // temporary
@@ -925,7 +925,6 @@ procedure TScreenEditSub.DeleteNote;
 var
   C:    integer;
   N:    integer;
-  NLen: integer;
 begin
   C := Lines[0].Current;
 
@@ -1230,9 +1229,6 @@ end;
 
 function TScreenEditSub.Draw: boolean;
 var
-  Min:    integer;
-  Sec:    integer;
-  Tekst:  string;
   Pet:    integer;
   AktBeat:  integer;
 begin
diff --git a/src/screens/UScreenOptionsRecord.pas b/src/screens/UScreenOptionsRecord.pas
index 5681035f..b622f56c 100644
--- a/src/screens/UScreenOptionsRecord.pas
+++ b/src/screens/UScreenOptionsRecord.pas
@@ -739,7 +739,6 @@ end;
 
 function TScreenOptionsRecord.Draw: boolean;
 var
-  i: integer;
   Device: TAudioInputDevice;
   DeviceCfg: PInputDeviceConfig;
   SelectSlide: TSelectSlide;
diff --git a/src/screens/UScreenOptionsThemes.pas b/src/screens/UScreenOptionsThemes.pas
index 82d7d782..ec6fe014 100644
--- a/src/screens/UScreenOptionsThemes.pas
+++ b/src/screens/UScreenOptionsThemes.pas
@@ -154,8 +154,6 @@ begin
 end;
 
 constructor TScreenOptionsThemes.Create;
-var
-  I:      integer;
 begin
   inherited Create;
 
diff --git a/src/screens/UScreenPartyNewRound.pas b/src/screens/UScreenPartyNewRound.pas
index 3d518eca..01de9df7 100644
--- a/src/screens/UScreenPartyNewRound.pas
+++ b/src/screens/UScreenPartyNewRound.pas
@@ -153,8 +153,6 @@ begin
 end;
 
 constructor TScreenPartyNewRound.Create;
-var
-  I:    integer;
 begin
   inherited Create;
 
@@ -217,7 +215,7 @@ var
   function GetTeamPlayers(const Num: Byte): String;
   var
     Players: Array of String;
-    J: Byte;
+    //J: Byte;
   begin            // to-do : Party
     if (Num-1 >= {PartySession.Teams.NumTeams}0) then
       exit;
diff --git a/src/screens/UScreenPartyOptions.pas b/src/screens/UScreenPartyOptions.pas
index 9992fab5..fafae0e0 100644
--- a/src/screens/UScreenPartyOptions.pas
+++ b/src/screens/UScreenPartyOptions.pas
@@ -199,8 +199,6 @@ begin
 end;
 
 constructor TScreenPartyOptions.Create;
-var
-  I:    integer;
 begin
   inherited Create;
   //Fill IPlaylist
diff --git a/src/screens/UScreenPartyPlayer.pas b/src/screens/UScreenPartyPlayer.pas
index ca18bc18..d38a6435 100644
--- a/src/screens/UScreenPartyPlayer.pas
+++ b/src/screens/UScreenPartyPlayer.pas
@@ -75,7 +75,6 @@ uses UGraphic, UMain, UIni, UTexture, UParty;
 
 function TScreenPartyPlayer.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
 var
-{*I, *}J:    integer; // Auto Removed, Unused Variable (I)
   SDL_ModState:  Word;
   procedure IntNext;
   begin
diff --git a/src/screens/UScreenPopup.pas b/src/screens/UScreenPopup.pas
index 4ef93549..bf4752b9 100644
--- a/src/screens/UScreenPopup.pas
+++ b/src/screens/UScreenPopup.pas
@@ -131,8 +131,6 @@ begin
 end;
 
 constructor TScreenPopupCheck.Create;
-var
-  I:    integer;
 begin
   inherited Create;
 
@@ -214,8 +212,6 @@ begin
 end;
 
 constructor TScreenPopupError.Create;
-var
-  I:    integer;
 begin
   inherited Create;
 
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index b6384b79..5783366d 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -249,9 +249,6 @@ end;
 //Pause Mod End
 
 constructor TScreenSing.Create;
-var
-  I: integer;
-  P: integer;
 begin
   inherited Create;
 
@@ -314,7 +311,6 @@ var
   V2R:    boolean;
   V2M:    boolean;
   V3R:    boolean;
-  NR:     TRecR;     //Some enlightment of who, how and what this is here please
   Color: TRGB;
 
   success: boolean;
@@ -641,9 +637,6 @@ function TScreenSing.Draw: boolean;
 var
   Min:   integer;
   Sec:   integer;
-  Tekst: string;
-  Flash: real;
-  S:     integer;
   T:     integer;
   CurLyricsTime: real;
 begin
@@ -931,8 +924,6 @@ end;
  // Called on sentence change
  // SentenceIndex: index of the new active sentence
 procedure TScreenSing.OnSentenceChange(SentenceIndex: cardinal);
-var
-  LyricEngine: TLyricEngine;
 begin
   //GoldenStarsTwinkle
   GoldenRec.SentenceChange;
diff --git a/src/screens/UScreenSongMenu.pas b/src/screens/UScreenSongMenu.pas
index c536fd2d..7aa2e498 100644
--- a/src/screens/UScreenSongMenu.pas
+++ b/src/screens/UScreenSongMenu.pas
@@ -187,8 +187,6 @@ begin
 end;
 
 constructor TScreenSongMenu.Create;
-var
-  I:    integer;
 begin
   inherited Create;