diff --git a/Firmware/system_timer.h b/Firmware/system_timer.h
index ca8f2f9a..626e8234 100644
--- a/Firmware/system_timer.h
+++ b/Firmware/system_timer.h
@@ -11,8 +11,8 @@
 #define _millis millis2
 #define _micros micros2
 #define _delay delay2
-#define _tone tone2
-#define _noTone noTone2
+#define _tone tone
+#define _noTone noTone
 
 #define timer02_set_pwm0(pwm0)
 
@@ -20,8 +20,8 @@
 #define _millis millis
 #define _micros micros
 #define _delay delay
-#define _tone(x, y) /*tone*/
-#define _noTone(x) /*noTone*/
+#define _tone tone
+#define _noTone noTone
 #define timer02_set_pwm0(pwm0)
 #endif //SYSTEM_TIMER_2
 
diff --git a/Firmware/timer02.c b/Firmware/timer02.c
index 6b6cbe2c..1f898940 100644
--- a/Firmware/timer02.c
+++ b/Firmware/timer02.c
@@ -136,14 +136,4 @@ void delay2(unsigned long ms)
 	}
 }
 
-void tone2(__attribute__((unused)) uint8_t _pin, __attribute__((unused)) unsigned int frequency/*, unsigned long duration*/)
-{
-	PIN_SET(BEEPER);
-}
-
-void noTone2(__attribute__((unused)) uint8_t _pin)
-{
-	PIN_CLR(BEEPER);
-}
-
 #endif //SYSTEM_TIMER_2
diff --git a/Firmware/timer02.h b/Firmware/timer02.h
index 48a4842f..2eef98f6 100644
--- a/Firmware/timer02.h
+++ b/Firmware/timer02.h
@@ -23,13 +23,6 @@ extern unsigned long micros2(void);
 ///! Reimplemented original delay() using timer2
 extern void delay2(unsigned long ms);
 
-///! Reimplemented original tone() using timer2
-///! Does not perform any PWM tone generation, it just sets the beeper pin to 1
-extern void tone2(uint8_t _pin, unsigned int frequency/*, unsigned long duration*/);
-
-///! Turn off beeping - set beeper pin to 0
-extern void noTone2(uint8_t _pin);
-
 #if defined(__cplusplus)
 }
 #endif //defined(__cplusplus)