diff --git a/project/cart/batmon.c b/project/cart/batmon.c
index 92e606b3e..b31128ddc 100644
--- a/project/cart/batmon.c
+++ b/project/cart/batmon.c
@@ -22,7 +22,7 @@ void batmon(void) {
     }
 
     /* turn on red led if battery charge is low */
-    if (battery_charge < 48) {  /* TODO */
+    if (battery_charge < 48) {
         leds_on(LEDS_RED);
     } else {
         leds_off(LEDS_RED);
diff --git a/project/cart/cart.c b/project/cart/cart.c
index 6b6513009..dbd0ac5d1 100644
--- a/project/cart/cart.c
+++ b/project/cart/cart.c
@@ -15,8 +15,7 @@ PROCESS_THREAD(cart_main_process, ev, data) {
 	PROCESS_BEGIN();
 
     /*** Variables initialization ***/
-    status = NOT_ASSOCIATED; // TODO DEBUG
-    //status = SHOPPING;
+    status = NOT_ASSOCIATED;
 
     /*** Timer initialization ***/
     etimer_set(&assigner_timer, 5 * CLOCK_SECOND);
diff --git a/project/cart/status.c b/project/cart/status.c
index 7b793d967..067993ec8 100644
--- a/project/cart/status.c
+++ b/project/cart/status.c
@@ -147,7 +147,6 @@ void s_cash_out_send_list(process_event_t ev, process_data_t data) {
         etimer_restart(&assigner_timer);
         leds_off(LEDS_GREEN);
         status = ASSOCIATED;
-        // status = SHOPPING; // TODO DEBUG
     }
 
 }