diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java
index cced55af1d3c..c1ad8d28db8f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.psi.impl.source.tree.injected;
 
-import com.intellij.openapi.util.ProperTextRange;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.LiteralTextEscaper;
 import com.intellij.psi.PsiLanguageInjectionHost;
@@ -34,7 +33,6 @@ public class StringLiteralEscaper<T extends PsiLanguageInjectionHost> extends Li
 
   @Override
   public boolean decode(@NotNull final TextRange rangeInsideHost, @NotNull StringBuilder outChars) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
     String subText = rangeInsideHost.substring(myHost.getText());
     outSourceOffsets = new int[subText.length()+1];
     return PsiLiteralExpressionImpl.parseStringCharacters(subText, outChars, outSourceOffsets);
diff --git a/json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java b/json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
index 58974bb4842c..e270f7109386 100644
--- a/json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
+++ b/json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
@@ -1,6 +1,5 @@
 package com.intellij.json.psi.impl;
 
-import com.intellij.openapi.util.ProperTextRange;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.LiteralTextEscaper;
@@ -15,7 +14,6 @@ public abstract class JSStringLiteralEscaper<T extends PsiLanguageInjectionHost>
   }
 
   public boolean decode(@NotNull final TextRange rangeInsideHost, @NotNull StringBuilder outChars) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
     String subText = rangeInsideHost.substring(myHost.getText());
 
     Ref<int[]> sourceOffsetsRef = new Ref<int[]>();
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/injected/CommentLiteralEscaper.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/injected/CommentLiteralEscaper.java
index 3374a2b59f87..86bcfc46305e 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/injected/CommentLiteralEscaper.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/injected/CommentLiteralEscaper.java
@@ -16,7 +16,6 @@
 
 package com.intellij.psi.impl.source.tree.injected;
 
-import com.intellij.openapi.util.ProperTextRange;
 import com.intellij.lang.CodeDocumentationAwareCommenter;
 import com.intellij.lang.Commenter;
 import com.intellij.lang.LanguageCommenters;
@@ -35,7 +34,6 @@ public class CommentLiteralEscaper extends LiteralTextEscaper<PsiCommentImpl> {
 
   @Override
   public boolean decode(@NotNull final TextRange rangeInsideHost, @NotNull StringBuilder outChars) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
     outChars.append(myHost.getText(), rangeInsideHost.getStartOffset(), rangeInsideHost.getEndOffset());
     return true;
   }
diff --git a/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java b/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java
index 7c67fe95a71f..e1116c8b0db5 100644
--- a/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java
+++ b/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java
@@ -746,7 +746,6 @@ public class DocumentWindowImpl extends UserDataHolderBase implements Disposable
   @Override
   @NotNull
   public ProperTextRange injectedToHost(@NotNull TextRange injected) {
-    ProperTextRange.assertProperRange(injected);
     int start = injectedToHost(injected.getStartOffset(), false);
     int end = injectedToHost(injected.getEndOffset(), true);
     if (end < start) {
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java
index e520eea741be..d50ce28437b5 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java
@@ -146,7 +146,6 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar, ModificationT
                                      @NonNls @Nullable String suffix,
                                      @NotNull PsiLanguageInjectionHost host,
                                      @NotNull TextRange rangeInsideHost) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
 
     PsiFile containingFile = PsiUtilCore.getTemplateLanguageFile(host);
     assert containingFile == myHostPsiFile : exceptionContext("Trying to inject into foreign file: "+containingFile);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java
index a4e0ce1c55cd..731c0106d283 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlAttributeLiteralEscaper.java
@@ -15,11 +15,10 @@
  */
 package com.intellij.psi.impl.source.tree.injected;
 
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.LiteralTextEscaper;
 import com.intellij.psi.impl.source.xml.XmlAttributeValueImpl;
 import com.intellij.psi.xml.XmlAttribute;
-import com.intellij.psi.LiteralTextEscaper;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.ProperTextRange;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -35,7 +34,6 @@ public class XmlAttributeLiteralEscaper extends LiteralTextEscaper<XmlAttributeV
 
   @Override
   public boolean decode(@NotNull final TextRange rangeInsideHost, @NotNull StringBuilder outChars) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
     TextRange valueTextRange = myXmlAttribute.getValueTextRange();
     int startInDecoded = myXmlAttribute.physicalToDisplay(rangeInsideHost.getStartOffset() - valueTextRange.getStartOffset());
     int endInDecoded = myXmlAttribute.physicalToDisplay(rangeInsideHost.getEndOffset() - valueTextRange.getStartOffset());
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java
index 01b1158c216d..7c7f73b1f6df 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java
@@ -15,13 +15,12 @@
  */
 package com.intellij.psi.impl.source.tree.injected;
 
-import com.intellij.psi.LiteralTextEscaper;
-import com.intellij.psi.impl.source.xml.XmlCommentImpl;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.ProperTextRange;
+import com.intellij.lang.CodeDocumentationAwareCommenter;
 import com.intellij.lang.Commenter;
 import com.intellij.lang.LanguageCommenters;
-import com.intellij.lang.CodeDocumentationAwareCommenter;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.LiteralTextEscaper;
+import com.intellij.psi.impl.source.xml.XmlCommentImpl;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -34,7 +33,6 @@ public class XmlCommentLiteralEscaper extends LiteralTextEscaper<XmlCommentImpl>
 
   @Override
   public boolean decode(@NotNull final TextRange rangeInsideHost, @NotNull final StringBuilder outChars) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
     outChars.append(myHost.getText(), rangeInsideHost.getStartOffset(), rangeInsideHost.getEndOffset());
     return true;
   }
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java
index 92a6b1f1a72b..e8ff30ff028e 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlTextLiteralEscaper.java
@@ -16,9 +16,8 @@
 package com.intellij.psi.impl.source.tree.injected;
 
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.ProperTextRange;
-import com.intellij.psi.impl.source.xml.XmlTextImpl;
 import com.intellij.psi.LiteralTextEscaper;
+import com.intellij.psi.impl.source.xml.XmlTextImpl;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -31,7 +30,6 @@ public class XmlTextLiteralEscaper extends LiteralTextEscaper<XmlTextImpl> {
 
   @Override
   public boolean decode(@NotNull final TextRange rangeInsideHost, @NotNull StringBuilder outChars) {
-    ProperTextRange.assertProperRange(rangeInsideHost);
     int startInDecoded = myHost.physicalToDisplay(rangeInsideHost.getStartOffset());
     int endInDecoded = myHost.physicalToDisplay(rangeInsideHost.getEndOffset());
     outChars.append(myHost.getValue(), startInDecoded, endInDecoded);