11 files changed, 3 insertions, 24 deletions
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index b2fb7773..8b13d410 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -602,15 +602,15 @@ begin
 end;
 
 procedure TScreenEditConvert.OnShow;
+{$IFDEF UseMIDIPort}
 var
   T:    integer; // track
   N:    integer; // note
-  {$IFDEF UseMIDIPort}
   MidiTrack: TMidiTrack;
   MidiEvent: PMidiEvent;
-  {$ENDIF}
   FileOpened: boolean;
   KMIDITrackIndex, SMFTrackIndex: integer;
+{$ENDIF}
 begin
   inherited;
 
@@ -731,7 +731,6 @@ var
   Y:      real;
   Height: real;
   YSkip:  real;
-  TrackName: UTF8String;
 begin
   // draw static menu
   inherited Draw;
diff --git a/src/screens/UScreenOptions.pas b/src/screens/UScreenOptions.pas
index 3a046400..bdb37701 100644
--- a/src/screens/UScreenOptions.pas
+++ b/src/screens/UScreenOptions.pas
@@ -146,8 +146,6 @@ begin
 end;
 
 constructor TScreenOptions.Create;
-//var
-// I:    integer; // Auto Removed, Unused Variable
 begin
   inherited Create;
 
diff --git a/src/screens/UScreenOptionsAdvanced.pas b/src/screens/UScreenOptionsAdvanced.pas
index 7116ad40..7a4ce15b 100644
--- a/src/screens/UScreenOptionsAdvanced.pas
+++ b/src/screens/UScreenOptionsAdvanced.pas
@@ -121,8 +121,6 @@ begin
 end;
 
 constructor TScreenOptionsAdvanced.Create;
-//var
-// I:      integer; // Auto Removed, Unused Variable
 begin
   inherited Create;
 
diff --git a/src/screens/UScreenOptionsGraphics.pas b/src/screens/UScreenOptionsGraphics.pas
index 504ed813..fc58626b 100644
--- a/src/screens/UScreenOptionsGraphics.pas
+++ b/src/screens/UScreenOptionsGraphics.pas
@@ -121,8 +121,6 @@ begin
 end;
 
 constructor TScreenOptionsGraphics.Create;
-//var
-// I:      integer; // Auto Removed, Unused Variable
 begin
   inherited Create;
   LoadFromTheme(Theme.OptionsGraphics);
diff --git a/src/screens/UScreenPartyOptions.pas b/src/screens/UScreenPartyOptions.pas
index 998d3655..f63b37fb 100644
--- a/src/screens/UScreenPartyOptions.pas
+++ b/src/screens/UScreenPartyOptions.pas
@@ -81,7 +81,6 @@ uses
 function TScreenPartyOptions.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 var
   I, J: integer;
-  OnlyMultiPlayer: boolean;
 begin
   Result := true;
   if (PressedDown) then
diff --git a/src/screens/UScreenPartyPlayer.pas b/src/screens/UScreenPartyPlayer.pas
index 3fcaa4ba..3f9c0f77 100644
--- a/src/screens/UScreenPartyPlayer.pas
+++ b/src/screens/UScreenPartyPlayer.pas
@@ -126,7 +126,6 @@ end;
 procedure TScreenPartyPlayer.UpdateParty;
   var
     I, J: integer;
-    Rounds: ARounds;
 begin
   {//Save PlayerNames
   for I := 0 to PartySession.Teams.NumTeams-1 do
diff --git a/src/screens/UScreenPartyRounds.pas b/src/screens/UScreenPartyRounds.pas
index 5211e32c..070c9eb8 100644
--- a/src/screens/UScreenPartyRounds.pas
+++ b/src/screens/UScreenPartyRounds.pas
@@ -114,9 +114,6 @@ begin
 end;
 
 function TScreenPartyRounds.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
-var
-  I, J: integer;
-  OnlyMultiPlayer: boolean;
 begin
   Result := true;
   if (PressedDown) then
diff --git a/src/screens/UScreenPartyScore.pas b/src/screens/UScreenPartyScore.pas
index 09f92dbc..3bfca4a8 100644
--- a/src/screens/UScreenPartyScore.pas
+++ b/src/screens/UScreenPartyScore.pas
@@ -124,7 +124,6 @@ end;
 
 constructor TScreenPartyScore.Create;
 var
-// I:    integer; // Auto Removed, Unused Variable
   Tex:  TTexture;
   R, G, B: real;
   Color: integer;
@@ -198,7 +197,6 @@ end;
 
 procedure TScreenPartyScore.OnShow;
 var
-  I, J: integer;
   Ranking: AParty_TeamRanking;
 begin
   inherited;
diff --git a/src/screens/UScreenPartyWin.pas b/src/screens/UScreenPartyWin.pas
index 3d7092bc..d9fd26d4 100644
--- a/src/screens/UScreenPartyWin.pas
+++ b/src/screens/UScreenPartyWin.pas
@@ -104,8 +104,6 @@ begin
 end;
 
 constructor TScreenPartyWin.Create;
-//var
-// I:    integer; // Auto Removed, Unused Variable
 begin
   inherited Create;
 
@@ -133,7 +131,7 @@ end;
 
 procedure TScreenPartyWin.OnShow;
 var
- I, J: integer;
+ I: integer;
  Ranking: AParty_TeamRanking;
 
   Function GetTeamColor(Team: integer): cardinal;
diff --git a/src/screens/UScreenScore.pas b/src/screens/UScreenScore.pas
index f1196654..40fe8fbc 100644
--- a/src/screens/UScreenScore.pas
+++ b/src/screens/UScreenScore.pas
@@ -523,10 +523,7 @@ end;
 
 function TScreenScore.Draw: boolean;
 var
-  CurrentTime:   cardinal;
   PlayerCounter: integer;
-  PStart:        integer;
-  PHigh:         integer;
 begin
 {*
   player[0].ScoreInt       := 7000;
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 7b52609a..8c4c1608 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -1012,8 +1012,6 @@ end;
 procedure TScreenSong.SetScroll1;
 var
   B:      integer;    // button
-  //BMin:   integer;    // button min // Auto Removed, Unused Variable
-  //BMax:   integer;    // button max // Auto Removed, Unused Variable
   Src:    integer;
   //Dst:    integer;
   Count:  integer;    // Dst is not used. Count is used.