diff --git a/epicardium/ble/ble_main.c b/epicardium/ble/ble_main.c
index 921976933d35b97f0e3394029d2cd4b5cd879088..ba9feaa02f8f0e990fdc747778aab1a26adc86a4 100644
--- a/epicardium/ble/ble_main.c
+++ b/epicardium/ble/ble_main.c
@@ -682,8 +682,6 @@ static void scannerScanReport(dmEvt_t *pMsg)
  *  \return None.
  */
 /*************************************************************************************************/
-#define ATT_CONNECTION_OPENED         0x81
-#define ATT_CONNECTION_CLOSED         0x82
 static void bleProcMsg(bleMsg_t *pMsg)
 {
   hciLeConnCmplEvt_t *connOpen;
diff --git a/epicardium/ble/epic_att_api.c b/epicardium/ble/epic_att_api.c
index fdfbdf9c39807d0dc9c62686632ca86d10bd9e88..d89a0f699bb72f4b0be6e76c2e3b3c9d4eba4102 100644
--- a/epicardium/ble/epic_att_api.c
+++ b/epicardium/ble/epic_att_api.c
@@ -42,8 +42,6 @@ static uint8_t DynAttsWriteCback(
 	uint8_t *pValue,
 	attsAttr_t *pAttr
 ) {
-	printf("DynAttsWriteCback %d, %d, %d\n", handle, len, offset);
-
 	struct epic_att_write *att_write = WsfBufAlloc(sizeof(*att_write));
 
 	if (att_write) {
@@ -93,7 +91,6 @@ int epic_atts_dyn_create_service(
 	*pSvcHandle = AttsDynCreateGroup(*start_handle, end_handle);
 	dyn_groups[next_dyn_group++] = *pSvcHandle;
 
-	//AttsDynRegister(pSvcHandle, DynAttsReadCback, DynAttsWriteCback);
 	AttsDynRegister(*pSvcHandle, NULL, DynAttsWriteCback);
 
 	AttsDynAddAttr(
@@ -246,8 +243,6 @@ int epic_ble_atts_handle_value_ntf(
 		return -EIO;
 	}
 
-	// TODO: There is a race condition here. Ideally AttsHandleValueNtf would return an error or
-	// raise a callback
 	AttsHandleValueNtf(connId, handle, valueLen, pValue);
 	return 0;
 }
@@ -259,8 +254,6 @@ int epic_ble_atts_handle_value_ind(
 		return -EIO;
 	}
 
-	// TODO: There is a race condition here. Ideally AttsHandleValueInd would return an error or
-	// raise a callback
 	AttsHandleValueInd(connId, handle, valueLen, pValue);
 	return 0;
 }