diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index 0ffb284c..626f5dec 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -116,10 +116,9 @@ enum {
 	VJ_VIDEO_EFFECT_PICINPIC = 241,
 	VJ_VIDEO_EFFECT_CHAMBLEND = 242,
 	VJ_VIDEO_EFFECT_RADIOACTIVE = 243,
-	VJ_VIDEO_EFFECT_TEXMAP = 244,
 	VJ_VIDEO_EFFECT_RIPPLETV = 245,
 	VJ_VIDEO_EFFECT_SLICER = 246,
-	VJ_VIDEO_EFFECT_IRIS   = 247,
+	VJ_VIDEO_EFFECT_IRIS   = 244,
 };
 
 enum {
@@ -222,7 +221,7 @@ enum {
 #define VJ_IMAGE_EFFECT_MAX 192
 
 #define VJ_VIDEO_EFFECT_MIN 200
-#define VJ_VIDEO_EFFECT_MAX 248
+#define VJ_VIDEO_EFFECT_MAX 247
 
 #define VJ_VIDEO_COUNT (VJ_VIDEO_EFFECT_MAX - VJ_VIDEO_EFFECT_MIN)
 
diff --git a/veejay-current/veejay-server/libvje/vj-effect.c b/veejay-current/veejay-server/libvje/vj-effect.c
index ef8bc4c1..d037249b 100644
--- a/veejay-current/veejay-server/libvje/vj-effect.c
+++ b/veejay-current/veejay-server/libvje/vj-effect.c
@@ -70,7 +70,7 @@
 #include "transitions/vbar.h"
 #include "effects/diff.h"
 #include "effects/bgsubtract.h"
-#include "effects/texmap.h"
+//#include "effects/texmap.h"
 #include "effects/contourextract.h"
 #include "effects/autoeq.h"
 #include "effects/colorhis.h"
@@ -270,7 +270,7 @@ static struct
 } complex_effect_index[] = 
 {
 	{	diff_malloc,		diff_free,			VJ_VIDEO_EFFECT_DIFF },
-	{	texmap_malloc,		texmap_free,			VJ_VIDEO_EFFECT_TEXMAP },
+//	{	texmap_malloc,		texmap_free,			VJ_VIDEO_EFFECT_TEXMAP },
 	{	contourextract_malloc,  contourextract_free,		VJ_IMAGE_EFFECT_CONTOUR },
 	{	cali_malloc,		cali_free,			VJ_IMAGE_EFFECT_CALI },
 	{	picinpic_malloc,	picinpic_free,			VJ_VIDEO_EFFECT_PICINPIC },
@@ -579,10 +579,10 @@ void vj_effect_initialize(int width, int height, int full_range)
 	vj_effects[41] = picinpic_init(width,height);
 	vj_effects[42] = chameleonblend_init(width,height);
 	vj_effects[43] = radioactivetv_init(width,height);
-	vj_effects[44] = texmap_init( width,height);
+//	vj_effects[44] = texmap_init( width,height);
 	vj_effects[45] = water_init(width,height);
 	vj_effects[46] = slicer_init(width,height);
-	vj_effects[47] = iris_init(width,height);
+	vj_effects[44] = iris_init(width,height);
     vj_effects[48] = dummy_init(width,height);
     vj_effects[i + 1] = mirrors2_init(width,height);
     vj_effects[i + 2] = mirrors_init(width,height);
@@ -731,7 +731,7 @@ void vj_effect_shutdown() {
     }
 
     diff_destroy();
-    texmap_destroy();
+    //texmap_destroy();
     contourextract_destroy();
     rotozoom_destroy();
     distortion_destroy();
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 5696a6d3..4a66a3bc 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -505,10 +505,10 @@ void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,int *arg,
 	diff_apply( vj_effects[entry]->user_data, frames[0], frames[1],
 		   frames[0]->width, frames[0]->height, arg[0], arg[1],arg[2],arg[3]);
 	break;
-	case VJ_VIDEO_EFFECT_TEXMAP:
+	/*case VJ_VIDEO_EFFECT_TEXMAP:
 	texmap_apply( vj_effects[entry]->user_data, frames[0],frames[1],
 			frames[0]->width,frames[0]->height,arg[0],arg[1],arg[2],arg[3],arg[4] );	
-	break;
+	break;*/
       case VJ_VIDEO_EFFECT_WHITEFRAME:
 	whiteframe_apply(frames[0], frames[1], frames[0]->width, frames[0]->height);
 	break;
@@ -675,13 +675,13 @@ int vj_effect_prepare( VJFrame *frame, int selector)
 				return	motionmap_prepare(	frame->data,	frame->width,	frame->height );
 			}	
 			break;
-		case	VJ_VIDEO_EFFECT_TEXMAP:
+	/*	case	VJ_VIDEO_EFFECT_TEXMAP:
 			fx_id = vj_effect_real_to_sequence( selector );
 			if( fx_id >= 0 && vj_effects[fx_id] )
 			{	
 				return texmap_prepare( frame->data, frame->width, frame->height );	
 			}
-			break;
+			break;*/
 		case 	VJ_VIDEO_EFFECT_CHAMBLEND:
 			fx_id = vj_effect_real_to_sequence( selector );
 			if( fx_id >= 0 && vj_effects[fx_id])
diff --git a/veejay-current/veejay-server/veejay/vj-misc.c b/veejay-current/veejay-server/veejay/vj-misc.c
index 9069eeda..974cddb2 100644
--- a/veejay-current/veejay-server/veejay/vj-misc.c
+++ b/veejay-current/veejay-server/veejay/vj-misc.c
@@ -239,7 +239,6 @@ int vj_perform_take_bg(veejay_t *info, VJFrame *frame, int pass)
 			n += vj_effect_prepare( frame, VJ_VIDEO_EFFECT_DIFF );
 			n += vj_effect_prepare( frame, VJ_IMAGE_EFFECT_MOTIONMAP );	
 			n += vj_effect_prepare( frame, VJ_IMAGE_EFFECT_CONTOUR );
-			n += vj_effect_prepare( frame, VJ_VIDEO_EFFECT_TEXMAP);
 		}
 
 		if( frame->ssm == 0 ) 
@@ -258,7 +257,7 @@ int vj_perform_take_bg(veejay_t *info, VJFrame *frame, int pass)
 			n += vj_effect_prepare( frame, VJ_VIDEO_EFFECT_DIFF );
 			n += vj_effect_prepare( frame, VJ_IMAGE_EFFECT_MOTIONMAP );	
 			n += vj_effect_prepare( frame, VJ_IMAGE_EFFECT_CONTOUR );
-			n += vj_effect_prepare( frame, VJ_VIDEO_EFFECT_TEXMAP);
+	//		n += vj_effect_prepare( frame, VJ_VIDEO_EFFECT_TEXMAP);
 			return 0;
 		}
 	}