diff --git a/kivy/c_ext/graphics/context_instructions.pyx b/kivy/c_ext/graphics/context_instructions.pyx
index c1c42d6a8..f38c5c439 100644
--- a/kivy/c_ext/graphics/context_instructions.pyx
+++ b/kivy/c_ext/graphics/context_instructions.pyx
@@ -1,12 +1,21 @@
 __all__ = ('LineWidth', 'Color', 'BindTexture', 'PushMatrix', 'PopMatrix', 'Rotate', 'Scale', 'Translate')
 
 from instructions cimport *
-from texture cimport *
 
 from kivy.resources import resource_find
 from kivy.core.image import Image
 from kivy.logger import Logger
 
+from os.path import join
+from kivy import kivy_shader_dir 
+cdef object DEFAULT_TEXTURE
+cdef object get_default_texture():
+    global DEFAULT_TEXTURE
+    if not DEFAULT_TEXTURE:
+        DEFAULT_TEXTURE = Image(join(kivy_shader_dir, 'default.png')).texture
+    return DEFAULT_TEXTURE
+
+
 cdef class LineWidth(ContextInstruction):
     '''Instruction to set the line width of the drawing context
     '''
diff --git a/kivy/c_ext/graphics/instructions.pxd b/kivy/c_ext/graphics/instructions.pxd
index 87a567943..f596f0cc4 100644
--- a/kivy/c_ext/graphics/instructions.pxd
+++ b/kivy/c_ext/graphics/instructions.pxd
@@ -51,11 +51,10 @@ cdef class Canvas(InstructionGroup):
 
 
 from shader cimport *
-from texture cimport *
 cdef class RenderContext(Canvas):
     cdef Shader shader
     cdef dict state_stacks
-    cdef TextureManager texture_manager
+    #cdef TextureManager texture_manager
     cdef object default_texture
     
     cdef set_state(self, str name, value)
diff --git a/kivy/c_ext/graphics/instructions.pyx b/kivy/c_ext/graphics/instructions.pyx
index 11eb0c8f6..270dc50bd 100644
--- a/kivy/c_ext/graphics/instructions.pyx
+++ b/kivy/c_ext/graphics/instructions.pyx
@@ -131,6 +131,7 @@ cdef class VertexInstruction(GraphicsInstruction):
         self.flag_update_done()
 
     cdef apply(self):
+        #print "DRAWING", self.texture_binding.texture, self.tex_coords
         if self.flags & GI_NEED_UPDATE:
             self.build()
             self.update_batch()
@@ -187,7 +188,7 @@ cdef popActiveCanvas():
 #on actual import from python problem
 include "common.pxi"
 from vertex cimport *
-from texture cimport *
+#from texture cimport *
 
 from os.path import join
 from kivy import kivy_shader_dir
@@ -206,7 +207,7 @@ cdef class RenderContext(Canvas):
         vs_src  = open(vs_file, 'r').read()
         fs_src  = open(fs_file, 'r').read()
         self.shader = Shader(vs_src, fs_src)
-        self.texture_manager = TextureManager()
+        #self.texture_manager = TextureManager()
 
         self.default_texture = Image(join(kivy_shader_dir, 'default.png')).texture
 
diff --git a/kivy/c_ext/graphics/texture.pxd b/kivy/c_ext/graphics/texture.pxd
deleted file mode 100644
index 57afe7947..000000000
--- a/kivy/c_ext/graphics/texture.pxd
+++ /dev/null
@@ -1,13 +0,0 @@
-
-cdef object get_default_texture()
-    
-cdef class TextureManager:
-    cdef dict textures
-    cdef dict texture_units
-    cdef list free_texture_units
-
-    cdef int bind_texture(self, object texture)
-    cdef release_texture(self, object texture)
-    cdef bind_all(self)
-    cdef release_all(self)
-    cdef reset(self)
diff --git a/kivy/c_ext/graphics/texture.pyx b/kivy/c_ext/graphics/texture.pyx
deleted file mode 100644
index 6e1c8d3c6..000000000
--- a/kivy/c_ext/graphics/texture.pyx
+++ /dev/null
@@ -1,89 +0,0 @@
-from c_opengl cimport *
-
-from os.path import join
-from kivy import kivy_shader_dir
-from kivy.logger import Logger
-from kivy.core.image import Image
-
-
-
-cdef object DEFAULT_TEXTURE
-cdef object get_default_texture():
-    global DEFAULT_TEXTURE
-    if not DEFAULT_TEXTURE:
-        DEFAULT_TEXTURE = Image(join(kivy_shader_dir, 'default.png')).texture
-    return DEFAULT_TEXTURE
-
-
-cdef class TextureManager:
-
-    def __init__(self):
-        self.free_texture_units = []
-        self.texture_units = dict()
-        self.textures = dict()
-        self.reset()
-
-    cdef int bind_texture(self, object texture):
-        cdef tex_unit = 0
-        #if binding None or 0, return texture unit of default texture
-        if texture == None or texture == 0:
-            return tex_unit
-        #if its already bound, nothing to do
-        tex_unit = self.textures.get(texture, -1)
-        if tex_unit != -1:
-            return tex_unit
-        # texture not bound yet, so bind it to a new unit
-        if self.free_texture_units:
-            tex_unit = self.free_texture_units.pop()
-        else:
-            tex_unit = len(self.textures)
-
-        #if weve reached max number of texture units, fallback to switching
-        #TODO: make this use the least recent used texture
-        if tex_unit == GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
-            tex_unit = 1
-            old_texture = self.texture_units[tex_unit]
-            del self.textures[old_texture]
-
-        #actually bind teh texture to teh correct texture unit
-        glActiveTexture(GL_TEXTURE0 + tex_unit)
-        glBindTexture(texture.target, texture.id)
-        self.textures[texture] = tex_unit
-        self.texture_units[tex_unit] = texture
-        #return the texture unit we bound the texture to
-        Logger.trace("TextureManager: binding texture on unit %d."%tex_unit)
-        return tex_unit
-
-    cdef release_texture(self, object texture):
-        #warn if texture to release isnt actualy bound
-        if not texture in self.textures:
-            Logger.warn("TextureManager: trying to release unbound texture!")
-            return
-        #unbind teh texture, and mark the texture unit as freed
-        cdef int tex_unit = self.textures[texture]
-        self.free_texture_units.append(tex_unit)
-        glActiveTexture(GL_TEXTURE0 + tex_unit)
-        glBindTexture(texture.target, 0)
-        del self.texture_units[tex_unit]
-        del self.textures[texture]
-
-    cdef bind_all(self):
-        #Logger.trace("TextureManager: rebinding %d textures"%len(self.textures))
-        #rebind all teh textures on the correct texture unit
-        for unit, texture in self.texture_units.iteritems():
-            glActiveTexture(GL_TEXTURE0 + unit)
-            glBindTexture(texture.target, texture.id)
-            
-    cdef release_all(self):
-        Logger.trace("TextureManager: releasing %d textures"%len(self.textures))
-        for texture in self.texture_units.itervalues():
-            self.release_texture(texture)
-
-    cdef reset(self):
-        Logger.trace("TextureManager: reseting TextureManager")
-        self.release_all()
-        self.free_texture_units = []
-        self.textures = dict()
-        tex0 = Image(join(kivy_shader_dir, 'default.png')).texture
-        self.bind_texture(tex0)
-
diff --git a/setup.py b/setup.py
index efd6ecff1..e5e9cfa65 100644
--- a/setup.py
+++ b/setup.py
@@ -104,7 +104,7 @@ if have_cython:
         'opengl',
         'buffer',
         'shader',
-        'texture',
+        #'texture',
         'vbo',
         'vertex',
         #'canvas',