diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index 60dcf28743..c6ecbda521 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -8139,7 +8139,7 @@ var
   ANode: TCodeTreeNode;
 begin
   Result:=GatherProcNodes(ClassNode.FirstChild,
-             [phpInUpperCase,phpAddClassName,phpWithStart],ExtractClassName(ClassNode,true));
+             [phpInUpperCase,phpAddClassName],ExtractClassName(ClassNode,true));
   if RemoveAbstracts then begin
     AnAVLNode:=Result.FindLowest;
     while AnAVLNode<>nil do begin
@@ -8163,7 +8163,7 @@ var
 begin
   TypeSectionNode:=ClassNode.GetTopMostNodeOfType(ctnTypeSection);
   Result:=GatherProcNodes(TypeSectionNode,
-                      [phpInUpperCase,phpIgnoreForwards,phpOnlyWithClassname,phpWithStart],
+                      [phpInUpperCase,phpIgnoreForwards,phpOnlyWithClassname],
                        ExtractClassName(ClassNode,true));
 end;
 
@@ -8708,7 +8708,7 @@ begin
     FCodeCompleteClassNode:=FindClassNode(CursorNode,CurClassName,true,false);
     if CodeCompleteClassNode=nil then
       RaiseException('oops, I lost your class');
-    ProcNode:=FindProcNode(CursorNode,FJumpToProcName,[phpInUpperCase,phpIgnoreForwards,phpWithStart]);
+    ProcNode:=FindProcNode(CursorNode,FJumpToProcName,[phpInUpperCase,phpIgnoreForwards]);
     if ProcNode=nil then begin
       debugln(['TCodeCompletionCodeTool.ApplyChangesAndJumpToFirstNewProc Proc="',FJumpToProcName,'"']);
       RaiseException(ctsNewProcBodyNotFound);
diff --git a/components/codetools/methodjumptool.pas b/components/codetools/methodjumptool.pas
index b795a5e0b1..138d7644fb 100644
--- a/components/codetools/methodjumptool.pas
+++ b/components/codetools/methodjumptool.pas
@@ -379,8 +379,8 @@ begin
                                                     GetNodeOfType(ctnProcedure);
     if (CursorNode=nil) then exit;
     // search corresponding proc node
-    Result:=FindBestProcNode(CursorNode,[phpAddClassName,phpInUpperCase,phpWithStart],
-                             TypeSectionNode,[phpIgnoreForwards,phpInUpperCase,phpWithStart],
+    Result:=FindBestProcNode(CursorNode,[phpAddClassName,phpInUpperCase],
+                             TypeSectionNode,[phpIgnoreForwards,phpInUpperCase],
                              false);
     {$IFDEF CTDEBUG}
     DebugLn('TMethodJumpingCodeTool.FindJumpPoint F FindBestProcNode=',dbgs(Result));
@@ -558,8 +558,8 @@ begin
           RaiseException('method "'+ProcName+'" has no declaration');
         end;
         // search method with same name and param list
-        Result:=FindBestProcNode(ProcNode,[phpWithoutClassName,phpInUpperCase,phpWithStart],
-                                 StartNode,[phpInUpperCase,phpWithStart],false);
+        Result:=FindBestProcNode(ProcNode,[phpWithoutClassName,phpInUpperCase],
+                                 StartNode,[phpInUpperCase],false);
         {$IFDEF CTDEBUG}
         DebugLn('TMethodJumpingCodeTool.FindJumpPoint 4E FindBestProcNode=',dbgs(Result));
         {$ENDIF}