diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs
index 59e1195541..2115ec5b7b 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs
@@ -2,7 +2,6 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs
index aa71fc71b3..2ed456e017 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs
@@ -2,16 +2,13 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Design;
-using System.Globalization;
 using System.IO;
 using System.Windows.Forms.Design;
 using System.Xml.Serialization;
 
-using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Addin.TypeProviders;
 using ICSharpCode.Reports.Core;
 
@@ -139,25 +136,17 @@ namespace ICSharpCode.Reports.Addin
 				if (this.imageSource == GlobalEnums.ImageSource.Database ) {
 					text = "<Database>";
 				}
+				
 				if (!String.IsNullOrEmpty(imageFileName)) {
 						this.image = this.LoadImage();
 						return this.image;
-					}
-				/*
-				this.image = FakeImage(base.Size,text);
-				if (this.image != null) {
-					return image;
-				} else {
-					var s = AbsoluteFileName;
-					if (!String.IsNullOrEmpty(imageFileName)) {
-						this.image = this.LoadImage();
-						return this.image;
-					}
+				} else
+				{
+					this.image = FakeImage(base.Size,text);
 				}
-				return null;
-				*/
-				return null;
+				return this.image;
 			}
+			
 			set {
 				this.image = value;
 				this.imageSource = GlobalEnums.ImageSource.External;
@@ -217,12 +206,10 @@ namespace ICSharpCode.Reports.Addin
 		
 		[XmlIgnoreAttribute]
 		[Category("Image")]
-//		[Browsable(false)]
+		[Browsable(false)]
 		public string AbsoluteFileName
 		{
 			get {
-				//D:\SharpDevelop3.0_WorkingCopy\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos
-				
 				if (!string.IsNullOrEmpty(relativeFileName)) {
 					Console.WriteLine("");
 					
@@ -230,16 +217,9 @@ namespace ICSharpCode.Reports.Addin
 					if (! String.IsNullOrEmpty(reportFileName)) {
 						testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName));
 					} 
-					
-//					else 
-//					{
-//						testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName));
-//					}
+
 					if (File.Exists(testFileName)){
 						Console.WriteLine("Image found with Relative Filename");
-//						Console.WriteLine("Report Filename {0}",this.reportFileName);
-//						Console.WriteLine("Relative Filename {0}",this.relativeFileName);
-//						Console.WriteLine("Image Filename {0}",this.ImageFileName);
 						return testFileName;
 					} else {
 						Console.WriteLine("AbsoluteFileName can't load image");
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs
index 3b9becf9e1..602281c62c 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs
@@ -2,12 +2,10 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 
-using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Addin.TypeProviders;
 
 namespace ICSharpCode.Reports.Addin
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs
index aefc01790f..e5c8d8c792 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs
@@ -2,11 +2,9 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 
-using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Addin.TypeProviders;
 using ICSharpCode.Reports.Core;
 
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs
index cec16f0ab7..072ea18178 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs
@@ -2,12 +2,9 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Windows.Forms;
 
-using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Addin.TypeProviders;
 using ICSharpCode.Reports.Core;
 
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs
index 4e1453d327..09464a5e25 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs
@@ -2,11 +2,9 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 
-using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Addin.Dialogs;
 using ICSharpCode.Reports.Addin.TypeProviders;
 using ICSharpCode.Reports.Core;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/GroupHeader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/GroupHeader.cs
index 742326e34d..d92070f67d 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/GroupHeader.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/GroupHeader.cs
@@ -2,13 +2,8 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-
-using ICSharpCode.Reports.Addin.Designer;
 using ICSharpCode.Reports.Addin.TypeProviders;
-using ICSharpCode.Reports.Core;
 
 namespace ICSharpCode.Reports.Addin
 {
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/SectionItemTypeProvider.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/SectionItemTypeProvider.cs
index 081d74e134..bb10d2e68c 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/SectionItemTypeProvider.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/SectionItemTypeProvider.cs
@@ -20,10 +20,6 @@ namespace ICSharpCode.Reports.Addin.TypeProviders
 		{
 		}
 		
-//		public SectionItemTypeProvider(TypeDescriptionProvider parent): base(parent)
-//		{
-//		}
-
 	
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
@@ -35,12 +31,11 @@ namespace ICSharpCode.Reports.Addin.TypeProviders
 	
 	internal class SectionItemDescriptor : CustomTypeDescriptor
 	{
-//		private BaseTextItem instance;
+
 		
 		public SectionItemDescriptor(ICustomTypeDescriptor parent, object instance)
 			: base(parent)
 		{
-//			instance = instance as BaseTextItem;
 		}