diff --git a/picketlink-bindings/picketlink-jbas-common/pom.xml b/picketlink-bindings/picketlink-jbas-common/pom.xml
index fd8f10e..0422c1e 100644
--- a/picketlink-bindings/picketlink-jbas-common/pom.xml
+++ b/picketlink-bindings/picketlink-jbas-common/pom.xml
@@ -137,12 +137,12 @@
          <version>6.0.18</version>
          <optional>true</optional>
       </dependency>
-      <dependency>
+      <!--<dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>juli</artifactId>
          <version>6.0.18</version>
          <optional>true</optional>
-      </dependency>
+      </dependency>-->
       <dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>coyote</artifactId>
diff --git a/picketlink-bindings/picketlink-jbas5/pom.xml b/picketlink-bindings/picketlink-jbas5/pom.xml
index 62f3726..c4fa3bd 100644
--- a/picketlink-bindings/picketlink-jbas5/pom.xml
+++ b/picketlink-bindings/picketlink-jbas5/pom.xml
@@ -94,12 +94,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>trove</groupId>
 			<artifactId>trove</artifactId>
 			<version>1.0.2</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/picketlink-bindings/picketlink-tomcat-common/pom.xml b/picketlink-bindings/picketlink-tomcat-common/pom.xml
index 6dd72b0..93aae67 100644
--- a/picketlink-bindings/picketlink-tomcat-common/pom.xml
+++ b/picketlink-bindings/picketlink-tomcat-common/pom.xml
@@ -135,12 +135,12 @@
          <version>6.0.18</version>
          <optional>true</optional>
       </dependency>
-      <dependency>
+      <!--<dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>juli</artifactId>
          <version>6.0.18</version>
          <optional>true</optional>
-      </dependency>
+      </dependency>-->
       <dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>coyote</artifactId>
diff --git a/picketlink-bindings/picketlink-tomcat5/pom.xml b/picketlink-bindings/picketlink-tomcat5/pom.xml
index 93dfa13..cf62023 100644
--- a/picketlink-bindings/picketlink-tomcat5/pom.xml
+++ b/picketlink-bindings/picketlink-tomcat5/pom.xml
@@ -133,12 +133,12 @@
          <version>6.0.18</version>
          <optional>true</optional>
       </dependency>
-      <dependency>
+      <!--<dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>juli</artifactId>
          <version>6.0.18</version>
          <optional>true</optional>
-      </dependency>
+      </dependency>-->
       <dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>coyote</artifactId>
diff --git a/picketlink-bindings/picketlink-tomcat7/pom.xml b/picketlink-bindings/picketlink-tomcat7/pom.xml
index 3554d9b..c4171e8 100644
--- a/picketlink-bindings/picketlink-tomcat7/pom.xml
+++ b/picketlink-bindings/picketlink-tomcat7/pom.xml
@@ -132,12 +132,12 @@
          <version>7.0.27</version>
          <optional>true</optional>
       </dependency>
-      <dependency>
+      <!--<dependency>
          <groupId>org.apache.tomcat</groupId>
          <artifactId>tomcat-juli</artifactId>
          <version>7.0.27</version>
          <optional>true</optional>
-      </dependency>
+      </dependency>-->
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
diff --git a/picketlink-bindings/pom.xml b/picketlink-bindings/pom.xml
index 02cbfa5..3547e7d 100644
--- a/picketlink-bindings/pom.xml
+++ b/picketlink-bindings/pom.xml
@@ -16,14 +16,14 @@
    <modules>
      <module>picketlink-tomcat-common</module>
      <module>picketlink-tomcat5</module>
-     <module>picketlink-tomcat7</module>
+     <!--<module>picketlink-tomcat7</module>-->
      <module>picketlink-jbas-common</module>
      <module>picketlink-jbas5</module>
-     <module>picketlink-jbas7</module>
-     <module>build-tomcat5</module>
-     <module>build-tomcat7</module>
+     <!--<module>picketlink-jbas7</module>-->
+     <!--<module>build-tomcat5</module>
+     <module>build-tomcat7</module>-->
      <module>build-jbas5</module>
-     <module>build-jbas7</module>
+     <!--<module>build-jbas7</module>-->
    </modules>
 
    <reporting>
diff --git a/picketlink-core/pom.xml b/picketlink-core/pom.xml
index 39311aa..97dfee9 100644
--- a/picketlink-core/pom.xml
+++ b/picketlink-core/pom.xml
@@ -64,11 +64,16 @@
         <artifactId>jbossxacml</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.picketbox</groupId>
-        <artifactId>picketbox</artifactId>
-         <version>4.0.7.Final</version>
+        <groupId>org.jboss.security</groupId>
+        <artifactId>jbosssx</artifactId>
+         <version>2.0.4.SP8</version>
          <scope>compile</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.security</groupId>
+        <artifactId>jboss-security-spi</artifactId>
+        <version>2.0.4.SP8</version>
+      </dependency>
      <dependency>
         <groupId>org.jboss.spec.javax.servlet</groupId>
         <artifactId>jboss-servlet-api_3.0_spec</artifactId>