diff --git a/src/Bullet3OpenCL/RigidBody/b3GpuBatchingPgsSolver.cpp b/src/Bullet3OpenCL/RigidBody/b3GpuBatchingPgsSolver.cpp
index 8be2c3929..f6eb0ce8e 100644
--- a/src/Bullet3OpenCL/RigidBody/b3GpuBatchingPgsSolver.cpp
+++ b/src/Bullet3OpenCL/RigidBody/b3GpuBatchingPgsSolver.cpp
@@ -134,11 +134,10 @@ b3GpuBatchingPgsSolver::b3GpuBatchingPgsSolver(cl_context ctx,cl_device_id devic
 	const char* solveContactSource = solveContactCL;
 	const char* solveFrictionSource = solveFrictionCL;
 	
-	
-	
+		
 	{
 		
-		cl_program solveContactProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, 0, &pErrNum,additionalMacros, B3_SOLVER_CONTACT_KERNEL_PATH,true);
+		cl_program solveContactProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, solveContactSource, &pErrNum,additionalMacros, B3_SOLVER_CONTACT_KERNEL_PATH);
 		b3Assert(solveContactProg);
 		
 		cl_program solveFrictionProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, solveFrictionSource, &pErrNum,additionalMacros, B3_SOLVER_FRICTION_KERNEL_PATH);
diff --git a/src/Bullet3OpenCL/RigidBody/b3Solver.cpp b/src/Bullet3OpenCL/RigidBody/b3Solver.cpp
index 903e26f90..030187c0a 100644
--- a/src/Bullet3OpenCL/RigidBody/b3Solver.cpp
+++ b/src/Bullet3OpenCL/RigidBody/b3Solver.cpp
@@ -168,7 +168,7 @@ b3Solver::b3Solver(cl_context ctx, cl_device_id device, cl_command_queue queue,
 	{
 		cl_program batchingNewProg = b3OpenCLUtils::compileCLProgramFromString( ctx, device, batchKernelNewSource, &pErrNum,additionalMacros, B3_BATCHING_NEW_PATH);
 		b3Assert(batchingNewProg);
-	
+
 		m_batchingKernelNew = b3OpenCLUtils::compileCLKernelFromString( ctx, device, batchKernelNewSource, "CreateBatchesNew", &pErrNum, batchingNewProg,additionalMacros );
 		//m_batchingKernelNew = b3OpenCLUtils::compileCLKernelFromString( ctx, device, batchKernelNewSource, "CreateBatchesBruteForce", &pErrNum, batchingNewProg,additionalMacros );
 		b3Assert(m_batchingKernelNew);
diff --git a/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl b/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl
index 0c971f403..992f20b16 100644
--- a/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl
+++ b/src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl
@@ -447,9 +447,7 @@ void BatchSolveKernelContact(__global Body* gBodies,
 	const int end = start + gN[cellIdx];
 
 	
-	//if (lIdx==0)
-	//printf("wgIdx = %d, start = %d, end=%d\n",wgIdx,start,end);
-
+	
 	
 	if( lIdx == 0 )
 	{
@@ -468,9 +466,6 @@ void BatchSolveKernelContact(__global Body* gBodies,
 		{
 			if (gConstraints[idx].m_batchIdx == ldsCurBatch)
 			{
-					//if (wgIdx==0 && lIdx==0)
-					//printf("solved wgIdx=%d, ldsCurBatch=%d idx=%d \n", wgIdx, ldsCurBatch,idx);
-					
 					solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );
 
 				 idx+=64;
@@ -480,8 +475,7 @@ void BatchSolveKernelContact(__global Body* gBodies,
 			}
 		}
 		GROUP_LDS_BARRIER;
-	//	if (wgIdx==0 && lIdx==0)
-	//		printf("-----------------------\n");
+	
 		if( lIdx == 0 )
 		{
 			ldsCurBatch++;
diff --git a/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h b/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h
index b19af6054..46e375822 100644
--- a/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h
+++ b/src/Bullet3OpenCL/RigidBody/kernels/solveContact.h
@@ -449,9 +449,7 @@ static const char* solveContactCL= \
 "	const int end = start + gN[cellIdx];\n"
 "\n"
 "	\n"
-"	//if (lIdx==0)\n"
-"	//printf(\"wgIdx = %d, start = %d, end=%d\n\",wgIdx,start,end);\n"
-"\n"
+"	\n"
 "	\n"
 "	if( lIdx == 0 )\n"
 "	{\n"
@@ -470,9 +468,6 @@ static const char* solveContactCL= \
 "		{\n"
 "			if (gConstraints[idx].m_batchIdx == ldsCurBatch)\n"
 "			{\n"
-"					//if (wgIdx==0 && lIdx==0)\n"
-"					//printf(\"solved wgIdx=%d, ldsCurBatch=%d idx=%d \n\", wgIdx, ldsCurBatch,idx);\n"
-"					\n"
 "					solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );\n"
 "\n"
 "				 idx+=64;\n"
@@ -482,8 +477,7 @@ static const char* solveContactCL= \
 "			}\n"
 "		}\n"
 "		GROUP_LDS_BARRIER;\n"
-"	//	if (wgIdx==0 && lIdx==0)\n"
-"	//		printf(\"-----------------------\n\");\n"
+"	\n"
 "		if( lIdx == 0 )\n"
 "		{\n"
 "			ldsCurBatch++;\n"