diff --git a/designer/controlselection.pp b/designer/controlselection.pp
index f717cf8987..c8cc5b8af4 100644
--- a/designer/controlselection.pp
+++ b/designer/controlselection.pp
@@ -165,8 +165,6 @@ begin
 end;
 
 procedure TGrabber.MouseMove(Shift: TShiftState; X, Y: Integer);
-var
-  dx, dy: Integer;
 begin
   if (CaptureGrabber<>nil) and (CaptureGrabber<>Self) then begin
     CaptureGrabber.CaptureMouseMove(Self,Shift, X, Y);
@@ -180,8 +178,6 @@ begin
 end;
 
 procedure TGrabber.MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-var
-  dx, dy: Integer;
 begin
 //Writeln('MouseUp in TGrabber');
 
diff --git a/designer/propedits.pp b/designer/propedits.pp
index bcdc86b2b4..e7a835be4c 100644
--- a/designer/propedits.pp
+++ b/designer/propedits.pp
@@ -1045,7 +1045,6 @@ function GetStrProp(Instance: TObject; PropInfo: PPropInfo): AnsiString;
 var
   Index, IValue: LongInt;
   ShortResult: ShortString;
-  AnsiResult: AnsiString;
 begin
   SetIndexValues(PropInfo, Index, IValue);
   case Propinfo^.PropType^.Kind of
@@ -1077,8 +1076,6 @@ begin
 	        Pointer(Result) := Pointer(LongWord(CallIntegerFunc(Instance,
    	        PPointer(Pointer(Instance.ClassType) + LongWord(PropInfo^.GetProc))^, Index, IValue)));
   	  end;
-      AnsiResult:=Result;
-      Pointer(AnsiResult):=nil;
      end;
     else
 	  // Property is neither of type AnsiString nor of type ShortString
@@ -1133,14 +1130,10 @@ procedure SetAStrProp(Instance : TObject;PropInfo : PPropInfo;
 //Dirty trick based on fact that AnsiString is just a pointer,
 //hence can be treated like an integer type.
 var
-  s: AnsiString;
   Index,Ivalue : Longint;
 begin
   { Another dirty trick which is necessary to increase the reference
    counter of Value... }
-  s := Value;
-  Pointer(s) := nil;
-
   SetIndexValues(PropInfo,Index,IValue);
   case (PropInfo^.PropProcs shr 2) and 3 of
     ptfield:
diff --git a/ide/compiler.pp b/ide/compiler.pp
index 3828bdebb4..156d31abe8 100644
--- a/ide/compiler.pp
+++ b/ide/compiler.pp
@@ -38,8 +38,6 @@ type
   
   TCompiler = class(TObject)
   private
-    FProjectFile: String;
-    FOutputFile: String;
     FOutputString : TOutString;
     FOutputList : TStringList;
   public
@@ -87,7 +85,6 @@ var
   Buf : Array[1..BUFSIZE] of char;
   I,Count : longint;
   Texts : String;
-  NUm : Integer;
   WriteMessage : Boolean;
 
   TheProcess : TProcess;
@@ -200,29 +197,18 @@ end;
             TCompiler GetMessageType
 ---------------------------------------------------------------------------}
 function TCompiler.GetMessageType(Value : String) : TErrorType;
-var
-  Texts : String;
-  num : Integer;
-  Temp : String;
 begin
   {This assumes the error message will have the line number
    in the format like:
    (123,45)
   }
-  
   Result := etNone;
-  
-  Texts := Value;
 end;
 
 {--------------------------------------------------------------------------
             TCompiler GetUnitname
 ---------------------------------------------------------------------------}
 function TCompiler.GetUnitName(Value : String) : String;
-var
-  Texts : String;
-  num : Integer;
-  Temp : String;
 begin
   {This assumes the error message will have the line number
    in the format like:
@@ -236,6 +222,10 @@ end.
 
 {
   $Log$
+  Revision 1.6  2001/02/04 18:24:41  lazarus
+  Code cleanup
+  Shane
+
   Revision 1.5  2001/01/31 06:26:23  lazarus
   Removed global unit.                                         CAW
 
diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp
index 567f32a9a5..9d7b451ba5 100644
--- a/ide/compileroptions.pp
+++ b/ide/compileroptions.pp
@@ -288,7 +288,7 @@ type
     btnApply: TButton;
     
     { Other variables }
-    fPath: String;
+//    fPath: String;
 
     { Procedures }
     procedure CreateForm(Sender: TObject);
@@ -327,9 +327,6 @@ const
 {  TCompilerOptions Constructor                                                }
 {------------------------------------------------------------------------------}
 constructor TCompilerOptions.Create;
-var
-  confPath: String;
-  fn: String;
 begin
   inherited Create;
   Assert(False, 'Trace:Compiler Options Class Created');
diff --git a/ide/compreg.pp b/ide/compreg.pp
index 8136d6b9eb..81b0165e3e 100644
--- a/ide/compreg.pp
+++ b/ide/compreg.pp
@@ -39,7 +39,6 @@ type
   TRegisteredComponentPage = class
   // describes the components in a single component page
   private
-    FCount:integer;
     FPageIndex:integer;
     FName:ShortString;
     FItems:TList;
diff --git a/ide/idecomp.pp b/ide/idecomp.pp
index f592483761..c7772ccae6 100644
--- a/ide/idecomp.pp
+++ b/ide/idecomp.pp
@@ -66,8 +66,6 @@ type
    private
      {The list of @link(TIdeComponent)s used in the IDE.}
      FItems : TList;
-     {The count of @link(TIdeComponent)s used in the IDE.}
-     FCount : Integer;
      {Used to count the @link(TIdeComponent)s used in the IDE.  Checks FItems.Count}
      Function GetCount : Integer;
    public
diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index 9071e54d57..fe811a116d 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -373,9 +373,10 @@ type
     FMaskHandle: HBITMAP;
     FPalette: HPALETTE;
     FDIBHandle: HBITMAP;
-    FDIB: TDIBSection;
+{    FDIB: TDIBSection;
     FOS2Format: Boolean;
     FHalftone: Boolean;
+}
   protected
     procedure FreeHandle; override;
   public
@@ -475,7 +476,7 @@ type
     procedure CreateHandle; override;
   public
     constructor Create(ABitMap : TBitmap);
-    destructor Destroy;
+    destructor Destroy; override;
     // TODO: replace this by property BitmapHandle;
     // MWE: Not needed
     //property Bitmap: TBitmap read FBitmap;
@@ -511,6 +512,10 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.4  2001/02/04 18:24:41  lazarus
+  Code cleanup
+  Shane
+
   Revision 1.3  2001/01/31 21:16:45  lazarus
   Changed to TCOmboBox focusing.
   Shane
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index 84b75eb332..3d8dc8fbf2 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -147,13 +147,8 @@ end;
 
  ------------------------------------------------------------------------------}
 procedure TCanvas.SetAutoReDraw(Value : Boolean);
-var
-   Msg : String;
-
 begin
-
    FAutoRedraw := Value;
-   msg := '';
    If FAutoReDraw then
       CNSendMessage(LM_REDraw, Self, nil);
 end;
@@ -526,6 +521,10 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.3  2001/02/04 18:24:41  lazarus
+  Code cleanup
+  Shane
+
   Revision 1.2  2000/08/10 18:56:24  lazarus
   Added some winapi calls.
   Most don't have code yet.
diff --git a/lcl/include/pixmap.inc b/lcl/include/pixmap.inc
index fb02cd5734..293614a70a 100644
--- a/lcl/include/pixmap.inc
+++ b/lcl/include/pixmap.inc
@@ -19,7 +19,7 @@ var
   BufPtr: ^PChar;
   P : PChar;
   S : TStringList;
-  n, BufIndex: Integer;
+  n : Integer;
   t : String;
 begin
   FreeContext;
@@ -34,7 +34,6 @@ begin
     Buf := GetMem(S.Count * SizeOf(PCharArray));
     BufPtr := Pointer(Buf);
     try
-      BufIndex := 0;
       for n := 0 to S.Count - 1 do
       if S.Strings[n][1] = '"'
       then begin
@@ -42,12 +41,9 @@ begin
         p := @S.Strings[n][2]; 
         //---
         BufPtr^ := @S.Strings[n][2];
-//        Buf^[BufIndex] := @S.Strings[n][2];
         P := StrScan(BufPtr^, '"');
-//        P := StrScan(Buf^[BufIndex], '"');
         if p <>  nil then p^ := #0;
         Inc(BufPtr);
-//        Inc(BufIndex);
       end;
       if FTransparentColor = clNone 
       then Handle := CreatePixmapIndirect(Buf, -1)
@@ -81,6 +77,10 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.6  2001/02/04 18:24:41  lazarus
+  Code cleanup
+  Shane
+
   Revision 1.5  2001/01/04 16:12:54  lazarus
   Removed some writelns and changed the property editor for TStrings a bit.
   Shane
diff --git a/lcl/include/winapi.inc b/lcl/include/winapi.inc
index d7c48ca5d4..2e695853c2 100644
--- a/lcl/include/winapi.inc
+++ b/lcl/include/winapi.inc
@@ -459,6 +459,7 @@ begin
   // your code here
   //TODO:WINAPI call CHARLOWERBUFF
   Writeln('TODO: WINAPI call CHARLOWERBUFF');
+  Result := -1;
 end;
 
 
@@ -944,6 +945,10 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.10  2001/02/04 18:24:42  lazarus
+  Code cleanup
+  Shane
+
   Revision 1.9  2001/01/23 19:13:57  lazarus
   Fixxed the errors I commited with Unionrect
   Shane
diff --git a/lcl/registry.pp b/lcl/registry.pp
index 58f9e62339..909c42c69c 100644
--- a/lcl/registry.pp
+++ b/lcl/registry.pp
@@ -74,7 +74,6 @@ type
     fRootKey: HKEY;
     fLazyWrite: Boolean;
     fCurrentPath: string;
-    fCloseRootKey: Boolean;
 
     procedure SetRootKey(Value: HKEY);
   protected
@@ -185,6 +184,10 @@ end.
 
 {
   $Log$
+  Revision 1.2  2001/02/04 18:24:41  lazarus
+  Code cleanup
+  Shane
+
   Revision 1.1  2000/07/13 10:28:24  michael
   + Initial import