diff --git a/core/src/main/java/org/jivesoftware/smack/XMPPException.java b/core/src/main/java/org/jivesoftware/smack/XMPPException.java
index 84fd546a5..87e675f65 100644
--- a/core/src/main/java/org/jivesoftware/smack/XMPPException.java
+++ b/core/src/main/java/org/jivesoftware/smack/XMPPException.java
@@ -167,17 +167,6 @@ public class XMPPException extends Exception {
         return streamError;
     }
 
-    /**
-     * Returns the Throwable asscociated with this exception, or <tt>null</tt> if there
-     * isn't one. @deprecated, use Exception.getCause() instead.
-     *
-     * @return the Throwable asscociated with this exception.
-     */
-    @Deprecated
-    public Throwable getWrappedThrowable() {
-        return getCause();
-    }
-
     public String getMessage() {
         String msg = super.getMessage();
         // If the message was not set, but there is an XMPPError, return the
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
index d13a535ad..794321edc 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
@@ -26,7 +26,6 @@ import org.jivesoftware.smackx.pep.packet.PEPEvent;
  *
  * @author Jeff Williams
  */
-@Deprecated
 public interface PEPListener {
 
     /**
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
index 44fccb0a1..73e6d32f6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
@@ -57,7 +57,6 @@ import org.jivesoftware.smackx.pep.packet.PEPPubSub;
  * 
  * @author Jeff Williams
  */
-@Deprecated
 public class PEPManager {
 
     private List<PEPListener> pepListeners = new ArrayList<PEPListener>();
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java
index 44bc57ecd..c455e0416 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java
@@ -27,7 +27,6 @@ import org.jivesoftware.smack.packet.PacketExtension;
  *
  * @author Jeff Williams
  */
-@Deprecated
 public class PEPEvent implements PacketExtension {
 
     PEPItem item;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java
index 5f1001dc7..0156bd957 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java
@@ -27,7 +27,6 @@ import org.jivesoftware.smack.packet.PacketExtension;
  *
  * @author Jeff Williams
  */
-@Deprecated
 public abstract class PEPItem implements PacketExtension {
     
     String id;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java
index c66fc4750..a2514426d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java
@@ -27,7 +27,6 @@ import org.jivesoftware.smack.packet.IQ;
  *
  * @author Jeff Williams
  */
-@Deprecated
 public class PEPPubSub extends IQ {
     
     PEPItem item;