diff --git a/src/cpm.c b/src/cpm.c
index 06dae62..b8df544 100644
--- a/src/cpm.c
+++ b/src/cpm.c
@@ -34,14 +34,13 @@
 #endif
 
 #define PI 3.141592654
-#define MAX_OBJ_RADAR 255
 
 /* Variables */
 
 float roadRotationSin;
 float roadRotationCos;
-long history_list[MAX_OBJ_RADAR][5];
-int valid_array[MAX_OBJ_RADAR];
+long history_list[NOF_OBJECTS][5];
+int valid_array[NOF_OBJECTS];
 
 S_ETHERNET_CONNECTION_T s_socket;
 S_INTERFACE_CONNECTION_T raw_socket;
@@ -158,7 +157,7 @@ dissemination_t* dissemination_init(){
 
 
 int dissemination_check(dissemination_t* dissemination, it2s_tender_epv_t* epv, int f) {
-    int rv = 1;
+    int rv;
     
     uint64_t now = it2s_tender_get_clock(epv); 
 
@@ -519,7 +518,7 @@ static int mk_cpm(facilities_t* facilities, uint8_t *bdr_oer, uint32_t *bdr_len,
 
   long euclidian_dist, abs_speed, abs_speed_hist, angle, angle_hist, angle_diff;
   int j = 0, rv = 0;
-  int temp[MAX_OBJ_RADAR];
+  int temp[NOF_OBJECTS];
    
 
   cpm_tx->header.protocolVersion = PROTOCOL_VERSION;