diff --git a/drools-camel/pom.xml b/drools-camel/pom.xml
index 299833f368..3fc980ac38 100644
--- a/drools-camel/pom.xml
+++ b/drools-camel/pom.xml
@@ -20,6 +20,10 @@
       <groupId>org.drools</groupId>
       <artifactId>knowledge-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>knowledge-internal-api</artifactId>
+    </dependency>	
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-core</artifactId>
@@ -36,10 +40,10 @@
       <groupId>org.drools</groupId>
       <artifactId>drools-spring</artifactId>
     </dependency>
-    <dependency>
+    <!-- dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-grid-impl</artifactId>
-    </dependency>
+    </dependency -->
     <!-- Camel -->
     <dependency>
       <groupId>org.apache.camel</groupId>
diff --git a/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java b/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
index 19bb45f106..04a497511a 100644
--- a/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
+++ b/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
@@ -43,8 +43,6 @@
 import org.drools.definition.KnowledgePackage;
 import org.drools.grid.GridNode;
 import org.drools.grid.impl.GridImpl;
-import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
 import org.drools.impl.StatefulKnowledgeSessionImpl;
 import org.drools.io.Resource;
 import org.drools.io.ResourceFactory;
@@ -128,8 +126,6 @@ protected Context createJndiContext() throws Exception {
         Context context = super.createJndiContext();
 
         GridImpl grid = new GridImpl( new HashMap() );
-        grid.addService( WhitePages.class,
-                         new WhitePagesImpl() );
         node = grid.createGridNode( "node" );
         node.set( "ksession1",
                   this.exec );
diff --git a/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java b/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
index b16a670f6d..471d9d0694 100644
--- a/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
+++ b/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
@@ -49,8 +49,6 @@
 import org.drools.definition.KnowledgePackage;
 import org.drools.grid.GridNode;
 import org.drools.grid.impl.GridImpl;
-import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.StatefulKnowledgeSession;
 import org.slf4j.Logger;
@@ -88,8 +86,8 @@ protected Context createJndiContext() throws Exception {
         Context context = super.createJndiContext();
 
         GridImpl grid = new GridImpl( new HashMap() );
-        grid.addService( WhitePages.class,
-                         new WhitePagesImpl() );
+//        grid.addService( WhitePages.class,
+//                         new WhitePagesImpl() );
         node = grid.createGridNode( "node" );
         context.bind( "node",
                       node );
diff --git a/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java b/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
index 88a676a596..0f27a561a9 100644
--- a/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
+++ b/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
@@ -51,8 +51,6 @@
 import org.drools.definition.KnowledgePackage;
 import org.drools.grid.GridNode;
 import org.drools.grid.impl.GridImpl;
-import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
 import org.drools.impl.KnowledgeBaseImpl;
 import org.drools.impl.StatefulKnowledgeSessionImpl;
 import org.drools.impl.StatelessKnowledgeSessionImpl;
@@ -93,8 +91,6 @@ protected Context createJndiContext() throws Exception {
         Context context = super.createJndiContext();
 
         GridImpl grid = new GridImpl( new HashMap() );
-        grid.addService( WhitePages.class,
-                         new WhitePagesImpl() );
         node = grid.createGridNode( "local" );
         
         node.set( "ksession1",