diff --git a/avr/main.asm b/avr/main.asm
index a284e9d..d01bcb2 100644
--- a/avr/main.asm
+++ b/avr/main.asm
@@ -243,108 +243,7 @@ initialWait_l2: ; wait for 10ms
 
 
 
-
-
-#ifdef MODULES_LCD
-
-printTimerMark:
-  in r15, SREG ; debug
-  push r15
-    cli
-    ldi r18, 6
-    ldi r19, 1
-    rcall LCD_SetCursor
-    lds r16, timerModuleCounterSecs
-    rcall LCD_PrintHexByte
-  pop r15
-  out SREG, r15
-  ret
-
-
-printSendStats:
-  in r15, SREG ; debug
-  push r15
-    cli
-
-    ldi r18, 0
-    ldi r19, 2
-    rcall LCD_SetCursor
-    ldi zl, LOW(textUid)
-    ldi zh, HIGH(textUid)
-    rcall LCD_PrintFromFlash
-    push xh                           ; 1-4: UID
-      push xl
-        rcall Utils_ReadUid           ; (R16, X)
-      pop xl
-    pop xh
-    push r18
-      push r19
-        mov r18, r20
-        mov r19, r21
-        rcall LCD_PrintHexWord
-      pop r19
-    pop r18
-    rcall LCD_PrintHexWord
-
-    ldi r18, 0
-    ldi r19, 3
-    rcall LCD_SetCursor
-    ldi zl, LOW(textAddress)
-    ldi zh, HIGH(textAddress)
-    rcall LCD_PrintFromFlash
-    lds r16, com2Address
-    rcall LCD_PrintHexByte
-    ldi r16, 32
-    rcall LCD_PrintChar
-    lds r16, cproMode
-    rcall LCD_PrintHexByte
-    ldi r16, 32
-    rcall LCD_PrintChar
-    lds r16, cproAddrRangeBegin
-    rcall LCD_PrintHexByte
-
-    ldi r18, 0
-    ldi r19, 4
-    rcall LCD_SetCursor
-    ldi zl, LOW(textBitmap)
-    ldi zh, HIGH(textBitmap)
-    rcall LCD_PrintFromFlash
-    lds r16, cproUsedAddresses
-    rcall LCD_PrintHexByte
-    lds r16, cproUsedAddresses+1
-    rcall LCD_PrintHexByte
-    lds r16, cproUsedAddresses+2
-    rcall LCD_PrintHexByte
-    lds r16, cproUsedAddresses+3
-    rcall LCD_PrintHexByte
-
-#ifdef MODULES_COM
-    ldi r18, 0
-    ldi r19, 5
-    rcall LCD_SetCursor
-    ldi zl, LOW(textStatsPacketsIn)
-    ldi zh, HIGH(textStatsPacketsIn)
-    rcall LCD_PrintFromFlash
-    lds r18, com2StatsPacketsIn
-    lds r19, com2StatsPacketsIn+1
-    rcall LCD_PrintHexWord
-  
-    ldi r18, 0
-    ldi r19, 6
-    rcall LCD_SetCursor
-    ldi zl, LOW(textStatsPacketsOut)
-    ldi zh, HIGH(textStatsPacketsOut)
-    rcall LCD_PrintFromFlash
-    lds r18, com2StatsPacketsOut
-    lds r19, com2StatsPacketsOut+1
-    rcall LCD_PrintHexWord
-#endif
- 
-  pop r15
-  out SREG, r15
-  ret
-
-
+#ifdef MODULES_DS18B20
 printDs:
   in r15, SREG ; debug
   push r15
@@ -373,67 +272,14 @@ printDs_loop1:
   ret
 #endif
 
+#endif
+
 
 
 #ifdef MODULES_SI7021
-#ifdef MODULES_COM
-
-#if 0
-Main_SendValueMsg:
-  in r15, SREG
-  push r15
-    cli
-    lds r16, com2Address                ; do we have an address assigned?
-    tst r16
-    breq sendValueMsg_done             ; no, do nothing
-    ; send message for current temp
-    lds r22, si7021Flags
-    mov r16, r22
-    andi r16, SI7021_FLAGS_TEMP_VALID
-    breq sendValueMsg_checkHum
-    ldi r16, 0xff                      ; destination address
-    ldi r17, VALUE_ID_TEMP1            ; value id
-    push r22
-      ldi r22, AQHOME_VALUETYPE_TEMP
-      lds r18, si7021LastTemp            ; value
-      lds r19, si7021LastTemp+1
-      ldi r20, 100                       ; denominator
-      clr r21
-      rcall CPRO_EnqueueValue
-    pop r22
-sendValueMsg_checkHum:
-    mov r16, r22
-    andi r16, SI7021_FLAGS_HUM_VALID
-    breq sendValueMsg_done
-    ldi r16, 0xff                      ; destination address
-    ldi r17, VALUE_ID_HUM1             ; value id
-    push r22
-      ldi r22, AQHOME_VALUETYPE_HUMIDITY
-      lds r18, si7021LastHumidity        ; value
-      lds r19, si7021LastHumidity+1
-      ldi r20, 1                         ; denominator
-      clr r21
-      rcall CPRO_EnqueueValue
-    pop r22
-sendValueMsg_done:
-  pop r15
-  out SREG, r15
-  ret
-#endif
-
-
-#ifdef MODULES_LCD
-  textStatsPacketsIn:      .db "In     : ", 0
-  textStatsPacketsRecvErr: .db "RecvErr: ", 0
-  textStatsPacketsOut:     .db "Out    : ", 0
-  textUid:                 .db "UID    : ", 0
-  textAddress:             .db "ADDR   :", 0, 0
-  textBitmap:              .db "BITMAP :", 0, 0
-
+# ifdef MODULES_LCD
   textDs18b20:             .db "Rec: ", 0
-#endif
-
-#endif
+# endif
 #endif