diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index ab9e311b97..78acdb78e5 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -609,7 +609,6 @@ public class ActiveMQMessage implements javax.jms.Message {
       return val;
    }
 
-   @SuppressWarnings("rawtypes")
    @Override
    public Enumeration getPropertyNames() throws JMSException {
       return Collections.enumeration(MessageUtil.getPropertyNames(message));
@@ -771,7 +770,7 @@ public class ActiveMQMessage implements javax.jms.Message {
    }
 
    @Override
-   public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+   public boolean isBodyAssignableTo(Class c) {
       /**
        * From the specs:
        * <p>
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index 0e6bbda2f8..a149dbd024 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -176,7 +176,7 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess
    }
 
    @Override
-   public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) {
+   public boolean isBodyAssignableTo(Class c) {
       if (data == null) // we have no body
          return true;
       try {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index 4b3f5c358c..1c7772cc6b 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -394,7 +394,6 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       return message.getBodyBuffer();
    }
 
-   @SuppressWarnings("rawtypes")
    @Override
    public boolean isBodyAssignableTo(Class c) {
       return false;
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
index ed887cfff2..3cfb0a559b 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
@@ -81,7 +81,6 @@ public class ActiveMQJMSVendor implements JMSVendor {
    }
 
    @Override
-   @SuppressWarnings("deprecation")
    public Destination createDestination(String name) {
       return new ServerDestination(name);
    }
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
index 73b443f100..a3e5f4cb82 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
@@ -184,7 +184,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @throws ResourceException Thrown if the managed connection can not be found
     */
    @Override
-   public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") final Set connectionSet,
+   public ManagedConnection matchManagedConnections(final Set connectionSet,
                                                     final Subject subject,
                                                     final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
index c22cc8d9c3..0b2cb6111b 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
@@ -181,7 +181,6 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @throws JMSException Thrown if an error occurs
     */
    @Override
-   @SuppressWarnings("rawtypes")
    public Enumeration getMapNames() throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getMapNames()");
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
index 7872459d62..d0600097ac 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
@@ -384,7 +384,6 @@ public class ActiveMQRAMessage implements Message {
     * @throws JMSException Thrown if an error occurs
     */
    @Override
-   @SuppressWarnings("rawtypes")
    public Enumeration getPropertyNames() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getPropertyNames()");
@@ -776,7 +775,7 @@ public class ActiveMQRAMessage implements Message {
    }
 
    @Override
-   public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes") Class c) throws JMSException {
+   public boolean isBodyAssignableTo(Class c) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("isBodyAssignableTo(" + c + ")");
       }
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
index a81f9aa1b3..1d102805a6 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
@@ -108,7 +108,6 @@ public class TcpTransportFactory extends TransportFactory {
    }
 
    @Override
-   @SuppressWarnings("rawtypes")
    public Transport compositeConfigure(Transport transport, WireFormat format, Map options) {
 
       TcpTransport tcpTransport = transport.narrow(TcpTransport.class);