diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java
index 3a3ba4e1142..0d9e9e08328 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/core/manipulation/dom/NecessaryParenthesesChecker.java
@@ -50,7 +50,6 @@
/**
* Helper class to check if an expression requires parentheses.
*
- * @see JDTUIHelperClasses
* @since 3.7
*/
public class NecessaryParenthesesChecker {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallerMethodWrapper.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallerMethodWrapper.java
index fab84ccb6ce..09a4300266b 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallerMethodWrapper.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallerMethodWrapper.java
@@ -94,7 +94,7 @@ public boolean canHaveChildren() {
/**
* @return The result of the search for children
- * @see org.eclipse.jdt.internal.ui.callhierarchy.MethodWrapper#findChildren(org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.jdt.internal.corext.callhierarchy.MethodWrapper#findChildren(IProgressMonitor)
*/
@Override
protected Map findChildren(IProgressMonitor progressMonitor) {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/DimensionRewrite.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/DimensionRewrite.java
index 45e8df414ac..e5f74e41657 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/DimensionRewrite.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/DimensionRewrite.java
@@ -31,7 +31,6 @@
/**
* Rewrite helper for {@link Dimension} node lists and {@link ArrayType}s.
*
- * @see JDTUIHelperClasses
* @since 3.10
*/
public class DimensionRewrite {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ModifierRewrite.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ModifierRewrite.java
index 94781ba4933..d5bb347903a 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ModifierRewrite.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/dom/ModifierRewrite.java
@@ -44,8 +44,6 @@
/**
* Rewrite helper for modifier lists.
- *
- * @see JDTUIHelperClasses
*/
public class ModifierRewrite {
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaConventionsUtil.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaConventionsUtil.java
index e27f430d8ec..ceb999c54ad 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaConventionsUtil.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaConventionsUtil.java
@@ -28,8 +28,6 @@
* the same element, please use {@link JavaConventions} directly (with the
* arguments from {@link #getSourceComplianceLevels(IJavaElement)}).
*
- *
- * @see JDTUIHelperClasses
*/
public class JavaConventionsUtil {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ExtractToNullCheckedLocalProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ExtractToNullCheckedLocalProposal.java
index 7365ff93172..1e6310d75dc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ExtractToNullCheckedLocalProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ExtractToNullCheckedLocalProposal.java
@@ -40,21 +40,18 @@
* and move the dereference into the then-block of this null-check:
*
*
- * {@code
- * @Nullable
+ * @Nullable
* Exception e;
- * }
* void test() {
* e.printStackTrace();
- * }
+ * }
+ *
*
* will be converted to:
*
*
- * {@code
- * @Nullable
+ * @Nullable
* Exception e;
- * }
* void test() {
* final Exception e2 = e;
* if (e2 != null) {
@@ -62,13 +59,14 @@
* } else {
* // TODO handle null value
* }
- * }
+ * }
+ *
*
* The final
keyword is added to remind the user that writing to the local variable has
* no effect on the original field.
*
*
- * Rrespects scoping if the problem occurs inside the initialization of a local variable (by moving
+ * Respects scoping if the problem occurs inside the initialization of a local variable (by moving
* statements into the new then block).
*
*