diff --git a/src/hss/hss_context.c b/src/hss/hss_context.c
index aa44131734..7388668e0b 100644
--- a/src/hss/hss_context.c
+++ b/src/hss/hss_context.c
@@ -55,10 +55,8 @@ status_t hss_context_init(void)
     profile->access_restriction_data = 0;
     profile->subscriber_status = HSS_SUBSCRIBER_STATUS_SERVICE_GRANTED;
     profile->network_access_mode = HSS_NETWORK_ACCESS_MODE_ONLY_PACKET;
-#if HSS_DISABLE_MAX_BANDWIDTH_PER_UE == 0
     profile->max_bandwidth_ul = 102400; /* Kbps */
     profile->max_bandwidth_dl = 102400; /* Kbps */
-#endif
 
     profile->subscribed_rau_tau_timer = 12; /* minutes */
 
@@ -303,10 +301,8 @@ hss_ue_t* hss_ue_add(hss_profile_id_t id, c_int8_t *imsi_bcd)
     ue->access_restriction_data = profile->access_restriction_data;
     ue->subscriber_status = profile->subscriber_status;
     ue->network_access_mode = profile->network_access_mode;
-#if HSS_DISABLE_MAX_BANDWIDTH_PER_UE == 0
     ue->max_bandwidth_ul = profile->max_bandwidth_ul;
     ue->max_bandwidth_dl = profile->max_bandwidth_dl;
-#endif
 
     ue->subscribed_rau_tau_timer = profile->subscribed_rau_tau_timer;
     
diff --git a/src/hss/hss_context.h b/src/hss/hss_context.h
index 1939b123d3..aa4c3937b0 100644
--- a/src/hss/hss_context.h
+++ b/src/hss/hss_context.h
@@ -14,9 +14,6 @@ extern "C" {
 #define HSS_KEY_LEN                 16
 #define HSS_AMF_LEN                 2
 
-/* FIXME : Does it needed? */
-#define HSS_DISABLE_MAX_BANDWIDTH_PER_UE 1
-
 typedef c_uint32_t hss_profile_id_t;
 typedef struct _hss_profile_t {
     lnode_t         node; /**< A node of list_t */
@@ -34,10 +31,8 @@ typedef struct _hss_profile_t {
     c_uint32_t      subscriber_status;
     c_uint32_t      network_access_mode;
 
-#if HSS_DISABLE_MAX_BANDWIDTH_PER_UE == 0
     c_uint32_t      max_bandwidth_ul; /* Kbps */
     c_uint32_t      max_bandwidth_dl; /* Kbps */
-#endif
 
     c_uint32_t      subscribed_rau_tau_timer; /* minutes */
 } hss_profile_t;
@@ -70,10 +65,8 @@ typedef struct _hss_ue_t {
 #define HSS_NETWORK_ACCESS_MODE_ONLY_PACKET                 2
     c_uint32_t      network_access_mode;
 
-#if HSS_DISABLE_MAX_BANDWIDTH_PER_UE == 0
     c_uint32_t      max_bandwidth_ul; /* Kbps */
     c_uint32_t      max_bandwidth_dl; /* Kbps */
-#endif
 
     c_uint32_t      subscribed_rau_tau_timer; /* minutes */
 
diff --git a/src/hss/hss_init.c b/src/hss/hss_init.c
index f0de2a1652..300a649a58 100644
--- a/src/hss/hss_init.c
+++ b/src/hss/hss_init.c
@@ -257,7 +257,6 @@ static int hss_ulr_cb( struct msg **msg, struct avp *avp,
                 avp_network_access_mode) == 0, goto out,);
 
             /* Set the AMBR */
-#if HSS_DISABLE_MAX_BANDWIDTH_PER_UE == 0
         d_assert(fd_msg_avp_new(s6a_ambr, 0, &avp_ambr) == 0, goto out,);
         d_assert(fd_msg_avp_new(s6a_max_bandwidth_ul, 0, 
                     &avp_max_bandwidth_ul) == 0, goto out,);
@@ -275,7 +274,6 @@ static int hss_ulr_cb( struct msg **msg, struct avp *avp,
                     avp_max_bandwidth_dl) == 0, goto out,);
         d_assert(fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_ambr) == 0, 
                 goto out,);
-#endif
 
         if (ue->num_of_pdn && ue->pdn[0])
         {
diff --git a/src/mme/mme_context.h b/src/mme/mme_context.h
index f7b4ae5d3b..54b2339f01 100644
--- a/src/mme/mme_context.h
+++ b/src/mme/mme_context.h
@@ -18,8 +18,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define MME_DISABLE_MAX_BANDWIDTH_PER_UE 1
-
 #define MAX_PLMN_ID                 6
 #define GRP_PER_MME                 256    /* According to spec it is 65535 */
 #define CODE_PER_MME                256    /* According to spec it is 256 */
@@ -142,10 +140,8 @@ typedef struct _mme_ue_t {
     /* HSS Info */
     c_uint32_t      ula_flags;
 
-#if MME_DISABLE_MAX_BANDWIDTH_PER_UE == 0
     c_uint32_t      max_bandwidth_ul; /* bits per seconds */
     c_uint32_t      max_bandwidth_dl; /* bits per seconds */
-#endif
 
     pdn_t           *pdn[MAX_NUM_OF_PDN];
     int             num_of_pdn;
diff --git a/src/mme/mme_s6a_handler.c b/src/mme/mme_s6a_handler.c
index bbd958ea9f..86e4163cd2 100644
--- a/src/mme/mme_s6a_handler.c
+++ b/src/mme/mme_s6a_handler.c
@@ -300,7 +300,6 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
     ue->msisdn_len = hdr->avp_value->os.len;
     memcpy(ue->msisdn, hdr->avp_value->os.data, ue->msisdn_len);
 
-#if MME_DISABLE_MAX_BANDWIDTH_PER_UE == 0
     d_assert(fd_avp_search_avp(avp, s6a_ambr, &avpch1) == 0 && avpch1, 
             error++; goto out,);
     d_assert(fd_avp_search_avp(avpch1, s6a_max_bandwidth_ul, &avpch2) == 0 && 
@@ -311,7 +310,6 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
             avpch2, error++; goto out,);
     d_assert(fd_msg_avp_hdr(avpch2, &hdr) == 0 && hdr, error++; goto out,);
     ue->max_bandwidth_dl = hdr->avp_value->i32;
-#endif
 
     d_assert(fd_avp_search_avp(avp, s6a_apn_configuration_profile, &avpch1) 
             == 0 && avpch1, error++; goto out,);