diff --git a/include/EPrimitiveTypes.h b/include/EPrimitiveTypes.h
index ae8f5f50..0c7036eb 100644
--- a/include/EPrimitiveTypes.h
+++ b/include/EPrimitiveTypes.h
@@ -36,20 +36,6 @@ namespace scene
 		//! Explicitly set all vertices for each triangle.
 		EPT_TRIANGLES,
 
-		//! After the first two vertices each further two vertices create a quad with the preceding two.
-		//! Not supported by Direct3D
-		EPT_QUAD_STRIP,
-
-		//! Every four vertices create a quad.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_QUADS,
-
-		//! Just as LINE_LOOP, but filled.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_POLYGON,
-
 		//! The single vertices are expanded to quad billboards on the GPU.
 		EPT_POINT_SPRITES
 	};
diff --git a/include/IMeshBuffer.h b/include/IMeshBuffer.h
index a2cd13a4..25609055 100644
--- a/include/IMeshBuffer.h
+++ b/include/IMeshBuffer.h
@@ -172,9 +172,6 @@ namespace scene
                 case scene::EPT_TRIANGLE_STRIP: return (indexCount-2);
                 case scene::EPT_TRIANGLE_FAN:   return (indexCount-2);
                 case scene::EPT_TRIANGLES:      return indexCount/3;
-                case scene::EPT_QUAD_STRIP:     return (indexCount-2)/2;
-                case scene::EPT_QUADS:          return indexCount/4;
-                case scene::EPT_POLYGON:        return indexCount; // (not really primitives, that would be 1, works like line_strip)
                 case scene::EPT_POINT_SPRITES:  return indexCount;
 			}
 			return 0;
diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp
index 4c31095c..80ddc52b 100644
--- a/source/Irrlicht/COpenGLDriver.cpp
+++ b/source/Irrlicht/COpenGLDriver.cpp
@@ -1034,15 +1034,6 @@ void COpenGLDriver::renderArray(const void* indexList, u32 primitiveCount,
 		case scene::EPT_TRIANGLES:
 			glDrawElements(GL_TRIANGLES, primitiveCount*3, indexSize, indexList);
 			break;
-		case scene::EPT_QUAD_STRIP:
-			glDrawElements(GL_QUAD_STRIP, primitiveCount*2+2, indexSize, indexList);
-			break;
-		case scene::EPT_QUADS:
-			glDrawElements(GL_QUADS, primitiveCount*4, indexSize, indexList);
-			break;
-		case scene::EPT_POLYGON:
-			glDrawElements(GL_POLYGON, primitiveCount, indexSize, indexList);
-			break;
 	}
 }
 
@@ -3893,12 +3884,6 @@ GLenum COpenGLDriver::primitiveTypeToGL(scene::E_PRIMITIVE_TYPE type) const
 			return GL_TRIANGLE_FAN;
 		case scene::EPT_TRIANGLES:
 			return GL_TRIANGLES;
-		case scene::EPT_QUAD_STRIP:
-			return GL_QUAD_STRIP;
-		case scene::EPT_QUADS:
-			return GL_QUADS;
-		case scene::EPT_POLYGON:
-			return GL_POLYGON;
 		case scene::EPT_POINT_SPRITES:
 #ifdef GL_ARB_point_sprite
 			return GL_POINT_SPRITE_ARB;