diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
index 503381a252e..9dc2b176665 100644
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
+++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/Messages.java
@@ -6,6 +6,7 @@
  * 
  * Contributors:
  *   Javier Montalvo Orus (Symbian) - initial API and implementation
+ *   Javier Montalvo Orus (Symbian) - NLS Cleanup
  ********************************************************************************/
 
 package org.eclipse.rse.internal.discovery;
@@ -19,16 +20,9 @@ public class Messages extends NLS {
 
 	public static String ServiceDiscoveryWizard_Port;
 
-	public static String ServiceDiscoveryWizard_SavingMessage;
-
-	public static String ServiceDiscoveryWizard_StatusId;
-
-	public static String ServiceDiscoveryWizard_StatusMessage;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
 	}
 
-	private Messages() {
-	}
 }
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
index 12852ba8466..5c1570f5862 100644
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
+++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/messages.properties
@@ -6,10 +6,8 @@
 # 
 # Contributors:
 #   Javier Montalvo Orus (Symbian) - initial API and implementation
+#   Javier Montalvo Orus (Symbian) - NLS Cleanup
 ##################################################################################
 
 ServiceDiscoveryWizard_DiscoveryPropertySet=Discovery
 ServiceDiscoveryWizard_Port=port
-ServiceDiscoveryWizard_SavingMessage=Saving RSE model
-ServiceDiscoveryWizard_StatusId=org.eclipse.tm.internal.discovery.wizard
-ServiceDiscoveryWizard_StatusMessage=RSE model saved
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java
index 1f879deb5e9..3a3b0585d62 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007, 2008 IBM Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * Javier Montalvo Orus (Symbian) - Added Externalized Strings
+ * Javier Montalvo Orus (Symbian) - NLS Cleanup
  ********************************************************************************/
 
 package org.eclipse.rse.internal.services.files.ftp;
@@ -21,10 +22,7 @@ import org.eclipse.osgi.util.NLS;
 public class FTPServiceResources extends NLS 
 {
 	private static String BUNDLE_NAME = "org.eclipse.rse.internal.services.files.ftp.FTPServiceResources";//$NON-NLS-1$
-	public static String FTP_File_Service_Copy_Not_Supported;
 	public static String FTP_File_Service_Deleting_Task;
-	public static String FTP_File_Service_Listing_Job;
-	public static String FTP_File_Service_Listing_Job_Success;
 	public static String FTP_File_Service_Monitor_Format;
 	public static String FTP_File_Service_Name;
 	public static String FTP_File_Service_Description;
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties
index 0951680193b..7ad169a8155 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 IBM Corporation. All rights reserved.
+# Copyright (c) 2006, 2007, 2008 IBM Corporation. All rights reserved.
 # This program and the accompanying materials are made available under the terms
 # of the Eclipse Public License v1.0 which accompanies this distribution, and is 
 # available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,7 @@
 # 
 # Contributors:
 # Javier Montalvo Orus (Symbian) - Added Externalized Strings
+# Javier Montalvo Orus (Symbian) - NLS Cleanup
 ################################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -20,7 +21,4 @@
 FTP_File_Service_Name=FTP File Service
 FTP_File_Service_Description=The FTP File Service uses the FTP protocol to provide service for the Files subsystem. It requires an FTP daemon to be running on the host machine.
 FTP_File_Service_Deleting_Task=Deleting 
-FTP_File_Service_Copy_Not_Supported=FTP copy not supported, use move instead
-FTP_File_Service_Listing_Job=Listing files...
-FTP_File_Service_Listing_Job_Success=Success
 FTP_File_Service_Monitor_Format={0,number,integer} KB of {1,number,integer} KB complete ({2,number,percent})