diff --git a/src/sipmanager.cpp b/src/sipmanager.cpp
index aad549a17ca6e0a943cacb236a8a21fea21062fc..522daa3b9e6c367354657adeffca7089bf07fb97 100755
--- a/src/sipmanager.cpp
+++ b/src/sipmanager.cpp
@@ -179,7 +179,7 @@ pj_status_t SIPManager::sipInit() {
     PJ_ASSERT_RETURN( status == PJ_SUCCESS, 1 );
 
     // Init presence module. 
-    // TODO We probably do need that extension
+    // TODO We probably do not need that extension
     status = pjsip_pres_init_module(_endpt, pjsip_evsub_instance());
     PJ_ASSERT_RETURN( status == PJ_SUCCESS, 1 );
     
@@ -645,7 +645,7 @@ pj_bool_t SIPManager::mod_on_rx_request(pjsip_rx_data *rdata) {
     if (rdata->msg_info.msg->line.req.method.id != PJSIP_INVITE_METHOD) {
         if (rdata->msg_info.msg->line.req.method.id != PJSIP_ACK_METHOD) {
             pj_strdup2(getInstance()->getAppPool(), &reason, "user agent unable to handle this request ");
-            pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, MSG_METHOD_NOT_ALLOWED, &reason, NULL,
+            pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, PJSIP_SC_METHOD_NOT_ALLOWED, &reason, NULL,
                     NULL);
             return PJ_TRUE;
         }
@@ -655,7 +655,7 @@ pj_bool_t SIPManager::mod_on_rx_request(pjsip_rx_data *rdata) {
     status = pjsip_inv_verify_request(rdata, &options, NULL, NULL, getInstance()->getEndPoint(), NULL);
     if (status != PJ_SUCCESS) {
         pj_strdup2(getInstance()->getAppPool(), &reason, "user agent unable to handle this INVITE ");
-        pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, MSG_METHOD_NOT_ALLOWED, &reason, NULL,
+        pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, PJSIP_SC_METHOD_NOT_ALLOWED, &reason, NULL,
                 NULL);
         return PJ_TRUE;
     }
@@ -718,7 +718,7 @@ pj_bool_t SIPManager::mod_on_rx_request(pjsip_rx_data *rdata) {
     /* Create the local dialog (UAS) */
     status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, NULL, &dialog);
     if (status != PJ_SUCCESS) {
-        pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, MSG_SERVER_INTERNAL_ERROR, &reason, NULL,
+        pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, &reason, NULL,
                 NULL);
         return PJ_TRUE;
     }
diff --git a/src/sipmanager.h b/src/sipmanager.h
index a40ca3b54df024fa83c9866c107630b8d0515680..577b3f5540cdacae0c752451355c021e5c25f154 100755
--- a/src/sipmanager.h
+++ b/src/sipmanager.h
@@ -25,17 +25,16 @@
 #include <pjlib-util.h>
 #include <pjlib.h>
 #include <pjnath/stun_config.h>
+
+//TODO Remove this include if we don't need anything from it
 #include <pjsip_simple.h>
+
 #include <pjsip_ua.h>
 #include <pjmedia/sdp.h>
 #include <pjmedia/sdp_neg.h>
 
 #include <string>
 #include <vector>
-#define MSG_OK                      200
-#define MSG_METHOD_NOT_ALLOWED      405
-#define MSG_NOT_ACCEPTABLE_HERE     488
-#define MSG_SERVER_INTERNAL_ERROR   500
 
 #define PJ_LOG_LEVEL	5