diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java
index 9a112a574e3e..58d522a54e2c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java
@@ -18,7 +18,6 @@ package com.intellij.psi.controlFlow;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiStatement;
 import com.intellij.util.containers.Stack;
 import gnu.trove.TObjectIntHashMap;
 import org.jetbrains.annotations.NotNull;
@@ -37,7 +36,7 @@ class ControlFlowImpl implements ControlFlow {
 
   private final Stack<PsiElement> myElementStack = new Stack<PsiElement>();
 
-  public void addInstruction(Instruction instruction) {
+  void addInstruction(Instruction instruction) {
     myInstructions.add(instruction);
     myElementsForInstructions.add(myElementStack.peek());
   }
@@ -45,20 +44,9 @@ class ControlFlowImpl implements ControlFlow {
   public void startElement(PsiElement element) {
     myElementStack.push(element);
     myElementToStartOffsetMap.put(element, myInstructions.size());
-
-    if (LOG.isDebugEnabled()){
-      if (element instanceof PsiStatement){
-        String text = element.getText();
-        int index = Math.min(text.indexOf('\n'), text.indexOf('\r'));
-        if (index >= 0){
-          text = text.substring(0, index);
-        }
-        addInstruction(new CommentInstruction(text));
-      }
-    }
   }
 
-  public void finishElement(PsiElement element) {
+  void finishElement(PsiElement element) {
     PsiElement popped = myElementStack.pop();
     LOG.assertTrue(popped.equals(element));
     myElementToEndOffsetMap.put(element, myInstructions.size());
@@ -101,7 +89,7 @@ class ControlFlowImpl implements ControlFlow {
   public boolean isConstantConditionOccurred() {
     return myConstantConditionOccurred;
   }
-  public void setConstantConditionOccurred(boolean constantConditionOccurred) {
+  void setConstantConditionOccurred(boolean constantConditionOccurred) {
     myConstantConditionOccurred = constantConditionOccurred;
   }
 
@@ -111,7 +99,7 @@ class ControlFlowImpl implements ControlFlow {
       Instruction instruction = myInstructions.get(i);
       buffer.append(Integer.toString(i));
       buffer.append(": ");
-      buffer.append(instruction.toString());
+      buffer.append(instruction);
       buffer.append("\n");
     }
     return buffer.toString();