diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
index 556de527..6864a484 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
@@ -20,9 +20,6 @@ import java.security.cert.X509Certificate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
@@ -44,9 +41,6 @@ import org.springframework.ws.soap.security.x509.X509AuthoritiesPopulator;
  * @version $Id: DaoX509AuthoritiesPopulator.java 2544 2008-01-29 11:50:33Z luke_t $
  */
 public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, InitializingBean, MessageSourceAware {
-	//~ Static fields/initializers =====================================================================================
-
-	private static final Log logger = LogFactory.getLog(DaoX509AuthoritiesPopulator.class);
 
 	//~ Instance fields ================================================================================================
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
index f6df7192..34707268 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
@@ -18,7 +18,6 @@ package org.springframework.ws.soap.security.xwss;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Hashtable;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
@@ -172,24 +171,6 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem
 		}
 	}
 
-	private SOAPMessage verifyInboundMessage(ProcessingContext context)
-			throws XWSSecurityException {
-		try {
-			return processor.verifyInboundMessage(context);
-		}
-		catch (XWSSecurityException ex) {
-			Throwable cause = ex.getCause();
-			if (cause instanceof NullPointerException) {
-				StackTraceElement[] stackTrace = cause.getStackTrace();
-				if (stackTrace.length >= 1 &&
-						Hashtable.class.getName().equals(stackTrace[0].getClassName())) {
-					return verifyInboundMessage(context);
-				}
-			}
-			throw ex;
-		}
-	}
-
 	@Override
 	protected void cleanUp() {
 		if (callbackHandler != null) {