diff --git a/scm-clients/pom.xml b/scm-clients/pom.xml
index a58a221f2e..f8c84d7cac 100644
--- a/scm-clients/pom.xml
+++ b/scm-clients/pom.xml
@@ -23,10 +23,50 @@
   
   <dependencies>
 
+    <!-- 
+    scm-core with excludes.
+    TODO: create a module only for data objects.
+    -->
+    
     <dependency>
-      <groupId>sonia.scm</groupId>
       <artifactId>scm-core</artifactId>
+      <groupId>sonia.scm</groupId>
+      <type>jar</type>
       <version>1.21-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>shiro-core</artifactId>
+          <groupId>org.apache.shiro</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>aopalliance</artifactId>
+          <groupId>aopalliance</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>guice</artifactId>
+          <groupId>com.google.inject</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>guice-multibindings</artifactId>
+          <groupId>com.google.inject.extensions</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>guice-servlet</artifactId>
+          <groupId>com.google.inject.extensions</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jersey-core</artifactId>
+          <groupId>com.sun.jersey</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>guice-throwingproviders</artifactId>
+          <groupId>com.google.inject.extensions</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-lang</artifactId>
+          <groupId>commons-lang</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml
index 332e720d7e..b7f64271f7 100644
--- a/scm-clients/scm-cli-client/pom.xml
+++ b/scm-clients/scm-cli-client/pom.xml
@@ -32,26 +32,6 @@
       <scope>provided</scope>
     </dependency>
     
-    <dependency>
-      <artifactId>scm-core</artifactId>
-      <groupId>sonia.scm</groupId>
-      <version>1.21-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>guice</artifactId>
-          <groupId>com.google.inject</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guice-servlet</artifactId>
-          <groupId>com.google.inject.extensions</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guice-multibindings</artifactId>
-          <groupId>com.google.inject.extensions</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
     <dependency>
       <groupId>sonia.scm.clients</groupId>
       <artifactId>scm-client-impl</artifactId>
diff --git a/scm-clients/scm-client-api/pom.xml b/scm-clients/scm-client-api/pom.xml
index 54cb43b037..0ef7e09a76 100644
--- a/scm-clients/scm-client-api/pom.xml
+++ b/scm-clients/scm-client-api/pom.xml
@@ -32,7 +32,7 @@
       <version>1.1</version>
       <scope>provided</scope>
     </dependency>
-  
+    
   </dependencies>
   
 </project>
\ No newline at end of file
diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml
index 7e0b49a806..fa88ce1e83 100644
--- a/scm-clients/scm-client-impl/pom.xml
+++ b/scm-clients/scm-client-impl/pom.xml
@@ -33,30 +33,6 @@
       <scope>provided</scope>
     </dependency>
     
-    <dependency>
-      <artifactId>scm-core</artifactId>
-      <groupId>sonia.scm</groupId>
-      <version>1.21-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>aopalliance</artifactId>
-          <groupId>aopalliance</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guice</artifactId>
-          <groupId>com.google.inject</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guice-multibindings</artifactId>
-          <groupId>com.google.inject.extensions</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guice-servlet</artifactId>
-          <groupId>com.google.inject.extensions</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  
     <dependency>
       <groupId>sonia.scm.clients</groupId>
       <artifactId>scm-client-api</artifactId>