diff --git a/c_adlib/GKEngine.cs b/c_adlib/GKEngine.cs
index e2c9e907..db231af7 100644
--- a/c_adlib/GKEngine.cs
+++ b/c_adlib/GKEngine.cs
@@ -295,7 +295,6 @@ namespace Novell.CASA.DataEngines
 
 	public static Boolean IsStoreAvailable()
         {
-            Console.WriteLine("Checking GKEngine");
               try
               {
 		        System.Runtime.InteropServices.Marshal.PrelinkAll(typeof(GnomeKeyring));
diff --git a/c_gui/CasaTray.cs b/c_gui/CasaTray.cs
index 0787d9a5..fb61b11d 100644
--- a/c_gui/CasaTray.cs
+++ b/c_gui/CasaTray.cs
@@ -79,8 +79,10 @@ namespace Novell.CASA.GUI
 			catch (Exception e)
 			{
 				//MessageBox.Show("File 'notify.ico' cannot be found", "Error");
-				Console.WriteLine(e.ToString());
-				Console.WriteLine("File 'notify.ico' cannot be found");
+				//Console.WriteLine(e.ToString());
+				//Console.WriteLine("File 'notify.ico' cannot be found");				
+				Logger.DbgLog("GUI:CasaTray.Setup() EXCEPTION: \n"e.ToString());
+				Logger.DbgLog("GUI:CasaTray.Setup(): File 'notify.ico' cannot be found");
 				return;
 			}
 
@@ -101,7 +103,8 @@ namespace Novell.CASA.GUI
 
 			catch (Exception e)
 			{			
-				Console.WriteLine("File 'CASAIcons.ico' cannot be found");
+				//Console.WriteLine("File 'CASAIcons.ico' cannot be found");
+				Logger.DbgLog("GUI:CasaTray.Setup(): File 'CASAIcons.ico' cannot be found");
 				return;
 			}
 
@@ -166,13 +169,12 @@ namespace Novell.CASA.GUI
 				menuLockMiCasa.Image = appimg; // sets the menu item's image		
 				menuLockMiCasa.Activated +=new EventHandler(menuLockMiCasa_Activated);		
 
-				ImageMenuItem menuUnLockMiCasa = new ImageMenuItem ("Unlock Secrets...");		
+				ImageMenuItem menuUnLockMiCasa = new ImageMenuItem ("Unlock Secrets");		
 				appimg = new Image(Stock.Open, IconSize.Menu);
 				menuUnLockMiCasa.Image = appimg; // sets the menu item's image
 				menuUnLockMiCasa.Activated +=new EventHandler(menuLockMiCasa_Activated);
 
 
-
 				popupMenu.Add(menuLockMiCasa);
 				popupMenu.Add(menuUnLockMiCasa);
 	
@@ -195,7 +197,7 @@ namespace Novell.CASA.GUI
 					menuDestroyMiCasa.Sensitive = true;
 				}
 
-				ImageMenuItem menuOptionsMiCasa = new ImageMenuItem ("Options ....");
+				ImageMenuItem menuOptionsMiCasa = new ImageMenuItem ("Preferences");
 				menuOptionsMiCasa.Sensitive = false;
 				popupMenu.Add(menuOptionsMiCasa);
 		
diff --git a/c_gui/CommonGUI.cs b/c_gui/CommonGUI.cs
index d7d97b92..db8e8bdf 100644
--- a/c_gui/CommonGUI.cs
+++ b/c_gui/CommonGUI.cs
@@ -260,7 +260,8 @@ namespace Novell.CASA.GUI
 				{
 					sk1.Close();
 					//ShowErrorMessage(e, "Reading registry " + KeyName.ToUpper());
-					Console.Write(e.ToString());
+					//Console.Write(e.ToString());
+					Logger.DbgLog("GUI:CommonGUI.WriteRegKey EXCEPTION: \n"e.ToString());
 					//return null;
 				}
 			}
diff --git a/c_gui/StoreDataInterface.cs b/c_gui/StoreDataInterface.cs
index 9ef2ad09..02c8682b 100644
--- a/c_gui/StoreDataInterface.cs
+++ b/c_gui/StoreDataInterface.cs
@@ -800,7 +800,7 @@ namespace Novell.CASA.GUI {
 					XmlNode lastChild = SecretNode.LastChild; //Get The newly added secret
 					if(lastChild!=null)
 					{												
-						Console.WriteLine("EXECUTING OPERATION_ADD_SECRET:Adding"+ccfSecretPath);//FIXME:Remove this line
+						//Console.WriteLine("EXECUTING OPERATION_ADD_SECRET:Adding"+ccfSecretPath);//FIXME:Remove this line
 						ad.SetSecret(lastChild,operation,storeIDentifier);	//and set it					
 					}
 				}//STORE_KDEWALLET