diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDialogPageMessageLine.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDialogPageMessageLine.java
index 525bda02c46..8116c058a5e 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDialogPageMessageLine.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDialogPageMessageLine.java
@@ -17,7 +17,9 @@ import org.eclipse.rse.ui.messages.ISystemMessageLine;
/**
* Message line interface implementation which forwards the calls
- * to the associated parent dialog page.
+ * to the associated parent dialog page.
+ *
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class RSEDialogPageMessageLine implements ISystemMessageLine {
private final DialogPage page;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
index 8157c78eec6..6c1ff7da531 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
@@ -48,6 +48,8 @@ import org.eclipse.ui.IWorkbench;
/**
* The New Connection wizard. This wizard allows users to create new RSE connections.
+ *
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, ISelectionProvider {
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java
index db8819ad6a6..7b7c0dd7d95 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java
@@ -27,6 +27,9 @@ import org.eclipse.rse.ui.wizards.registries.RSEAbstractWizardRegistry;
/**
* RSE New connection wizard registry implementation.
+ *
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
*/
public class RSENewConnectionWizardRegistry extends RSEAbstractWizardRegistry {
private final Map cache = new HashMap();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardCategory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardCategory.java
index f76b72bb589..e717740eaa0 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardCategory.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardCategory.java
@@ -13,10 +13,6 @@ package org.eclipse.rse.ui.wizards.registries;
/**
* Common wizard category descriptor used by the RSEAbstractWizardRegistry
* to handle wizard categories contributed via a wizard extension point.
- *
- * The IRSEWizardCategory
interface is based on
- * org.eclipse.ui.wizards.IWizardCategory
interface which is
- * unfortunately marked as not intended to be implemented by clients!
*/
public interface IRSEWizardCategory extends IRSEWizardRegistryElement {
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardDescriptor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardDescriptor.java
index 06cf8cca28d..41306394845 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardDescriptor.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/IRSEWizardDescriptor.java
@@ -16,10 +16,6 @@ import org.eclipse.swt.graphics.Image;
/**
* Common wizard descriptor used by the RSEAbstractWizardRegistry
* to handle wizards contributed via a wizard extension point.
- *
- * The IRSEWizardDescriptor
interface is based on
- * org.eclipse.ui.wizards.IWizardDescriptor
interface which is
- * unfortunately marked as not intended to be implemented by clients!
*/
public interface IRSEWizardDescriptor extends IRSEWizardRegistryElement {