diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java b/python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
index 0666a9fae4c6..f962f3cd6548 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
@@ -65,9 +65,4 @@ public interface PyClassLikeType extends PyCallableType, PyWithAncestors, PyInst
 
   @Nullable
   PyClassLikeType getMetaClassType(@NotNull TypeEvalContext context, boolean inherited);
-
-  @Override
-  default void accept(@NotNull PyTypeVisitor visitor) {
-    visitor.visitClassLikeType(this);
-  }
 }
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyType.java b/python/psi-api/src/com/jetbrains/python/psi/types/PyType.java
index 47b8ca9b91c3..4cb8dd4a10a2 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/types/PyType.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/types/PyType.java
@@ -91,7 +91,4 @@ public interface PyType {
   boolean isBuiltin();
 
   void assertValid(String message);
-
-  default void accept(@NotNull PyTypeVisitor visitor) {
-  }
 }
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeVisitor.java b/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeVisitor.java
deleted file mode 100644
index bf52b590df65..000000000000
--- a/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeVisitor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.psi.types;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Mikhail Golubev
- */
-public abstract class PyTypeVisitor {
-  public void visitType(@NotNull PyType type) {}
-
-  public void visitCallableType(@NotNull PyCallableType type) {
-    visitType(type);
-  }
-
-  public void visitFunctionType(@NotNull PyFunctionType type) {
-    visitCallableType(type);
-  }
-
-  public void visitClassLikeType(@NotNull PyClassLikeType type) {
-    visitCallableType(type);
-  }
-
-  public void visitClassType(@NotNull PyClassType type) {
-    visitClassLikeType(type);
-  }
-}
diff --git a/python/src/com/jetbrains/python/psi/types/PyCallableTypeImpl.java b/python/src/com/jetbrains/python/psi/types/PyCallableTypeImpl.java
index e55cf79014d5..bffa3cc6cc4c 100644
--- a/python/src/com/jetbrains/python/psi/types/PyCallableTypeImpl.java
+++ b/python/src/com/jetbrains/python/psi/types/PyCallableTypeImpl.java
@@ -110,11 +110,4 @@ public class PyCallableTypeImpl implements PyCallableType {
   @Override
   public void assertValid(String message) {
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      visitor.visitCallableType(this);
-    }
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java b/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
index 6087298fa8b0..cfc8007af8fc 100644
--- a/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
+++ b/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
@@ -901,9 +901,4 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
       return (instance != target);
     }
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    visitor.visitClassType(this);
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyCollectionTypeImpl.java b/python/src/com/jetbrains/python/psi/types/PyCollectionTypeImpl.java
index 2634cd49bfb8..8253ddf926e2 100644
--- a/python/src/com/jetbrains/python/psi/types/PyCollectionTypeImpl.java
+++ b/python/src/com/jetbrains/python/psi/types/PyCollectionTypeImpl.java
@@ -111,11 +111,4 @@ public class PyCollectionTypeImpl extends PyClassTypeImpl implements PyCollectio
     // TODO: Select the parameter type that matches T in Iterable[T]
     return ContainerUtil.getFirstItem(myElementTypes);
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitCollectionType(this);
-    }
-  }
 }
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/psi/types/PyFunctionTypeImpl.java b/python/src/com/jetbrains/python/psi/types/PyFunctionTypeImpl.java
index 4cab43d603ba..737332cd0bb7 100644
--- a/python/src/com/jetbrains/python/psi/types/PyFunctionTypeImpl.java
+++ b/python/src/com/jetbrains/python/psi/types/PyFunctionTypeImpl.java
@@ -182,9 +182,4 @@ public class PyFunctionTypeImpl implements PyFunctionType {
     }
     return this;
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    visitor.visitFunctionType(this);
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyGenericType.java b/python/src/com/jetbrains/python/psi/types/PyGenericType.java
index 9fd7767cd5fa..c3d0b0bba176 100644
--- a/python/src/com/jetbrains/python/psi/types/PyGenericType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyGenericType.java
@@ -131,11 +131,4 @@ public class PyGenericType implements PyType, PyInstantiableType<PyGenericType>
   public PyGenericType toClass() {
     return myIsDefinition ? this : new PyGenericType(myName, myBound, true, myTargetExpression);
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitGenericType(this);
-    }
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java b/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
index 4fe5bdc87dfc..71f700a3c7cd 100644
--- a/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
@@ -123,13 +123,6 @@ public class PyImportedModuleType implements PyType {
     return myImportedModule;
   }
 
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitImportedModuleType(this);
-    }
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
diff --git a/python/src/com/jetbrains/python/psi/types/PyModuleType.java b/python/src/com/jetbrains/python/psi/types/PyModuleType.java
index 4801a0baf20b..369dd996caf2 100644
--- a/python/src/com/jetbrains/python/psi/types/PyModuleType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyModuleType.java
@@ -507,10 +507,4 @@ public class PyModuleType implements PyType { // Modules don't descend from obje
     return MODULE_MEMBERS;
   }
 
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitModuleType(this);
-    }
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyNoneType.java b/python/src/com/jetbrains/python/psi/types/PyNoneType.java
index 4cf627d5f628..18e83a86dd8f 100644
--- a/python/src/com/jetbrains/python/psi/types/PyNoneType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyNoneType.java
@@ -60,11 +60,4 @@ public class PyNoneType implements PyType { // TODO must extend ClassType. It's
   @Override
   public void assertValid(String message) {
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitNoneType(this);
-    }
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyStructuralType.java b/python/src/com/jetbrains/python/psi/types/PyStructuralType.java
index dacd8dc90f55..67de94c2f3d8 100644
--- a/python/src/com/jetbrains/python/psi/types/PyStructuralType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyStructuralType.java
@@ -88,11 +88,4 @@ public class PyStructuralType implements PyType {
   public Set<String> getAttributeNames() {
     return myAttributes;
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitStructuralType(this);
-    }
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyTupleType.java b/python/src/com/jetbrains/python/psi/types/PyTupleType.java
index 1faf0353af55..c2d23b231228 100644
--- a/python/src/com/jetbrains/python/psi/types/PyTupleType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyTupleType.java
@@ -124,11 +124,4 @@ public class PyTupleType extends PyClassTypeImpl implements PyCollectionType {
   public PyType getIteratedItemType() {
     return PyUnionType.union(myElementTypes);
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitTupleType(this);
-    }
-  }
 }
diff --git a/python/src/com/jetbrains/python/psi/types/PyTypeVisitorExt.java b/python/src/com/jetbrains/python/psi/types/PyTypeVisitorExt.java
deleted file mode 100644
index aa608de7531e..000000000000
--- a/python/src/com/jetbrains/python/psi/types/PyTypeVisitorExt.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.psi.types;
-
-import com.jetbrains.python.codeInsight.stdlib.PyNamedTupleType;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Mikhail Golubev
- */
-public abstract class PyTypeVisitorExt extends PyTypeVisitor {
-
-  public void visitNoneType(@NotNull PyNoneType type) {
-    visitType(type);
-  }
-
-  public void visitUnionType(@NotNull PyUnionType type) {
-    visitType(type);
-  }
-
-  public void visitGenericType(@NotNull PyGenericType type) {
-    visitType(type);
-  }
-
-  public void visitCollectionType(@NotNull PyCollectionType type) {
-    visitClassType(type);
-  }
-
-  public void visitTupleType(@NotNull PyTupleType type) {
-    visitCollectionType(type);
-  }
-
-  public void visitNamedTupleType(@NotNull PyNamedTupleType type) {
-    visitTupleType(type);
-  }
-
-  public void visitStructuralType(@NotNull PyStructuralType type) {
-    visitType(type);
-  }
-
-  public void visitImportedModuleType(@NotNull PyImportedModuleType type) {
-    visitType(type);
-  }
-
-  public void visitModuleType(@NotNull PyModuleType type) {
-    visitType(type);
-  }
-}
diff --git a/python/src/com/jetbrains/python/psi/types/PyUnionType.java b/python/src/com/jetbrains/python/psi/types/PyUnionType.java
index a43a907650fe..2677bd1ba357 100644
--- a/python/src/com/jetbrains/python/psi/types/PyUnionType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyUnionType.java
@@ -219,11 +219,4 @@ public class PyUnionType implements PyType {
   public String toString() {
     return "PyUnionType: " + getName();
   }
-
-  @Override
-  public void accept(@NotNull PyTypeVisitor visitor) {
-    if (visitor instanceof PyTypeVisitorExt) {
-      ((PyTypeVisitorExt)visitor).visitUnionType(this);
-    }
-  }
 }