diff --git a/left/src/i2c_watchdog.c b/left/src/i2c_watchdog.c
index 26748e2..f60535d 100644
--- a/left/src/i2c_watchdog.c
+++ b/left/src/i2c_watchdog.c
@@ -4,7 +4,7 @@
 #include "test_led.h"
 #include "init_peripherals.h"
 
-static uint32_t prevWatchdogCounter = 0;
+//static uint32_t prevWatchdogCounter = 0;
 uint32_t I2cWatchdog_RecoveryCounter;
 volatile uint32_t I2cWatchdog_WatchCounter;
 
@@ -18,7 +18,7 @@ void InitI2cWatchdog(void)
     EnableIRQ(LPTMR0_IRQn);
     LPTMR_StartTimer(LPTMR0);
 }
-
+/*
 void I2C_WATCHDOG_LPTMR_HANDLER(void)
 {
     TEST_LED_TOGGLE();
@@ -35,3 +35,4 @@ void I2C_WATCHDOG_LPTMR_HANDLER(void)
 
     LPTMR_ClearStatusFlags(LPTMR0, kLPTMR_TimerCompareFlag);
 }
+*/
diff --git a/left/src/init_peripherals.c b/left/src/init_peripherals.c
index 91172c0..955e09a 100644
--- a/left/src/init_peripherals.c
+++ b/left/src/init_peripherals.c
@@ -10,6 +10,7 @@
 #include "slave_protocol_handler.h"
 #include "i2c_watchdog.h"
 #include "debug_over_spi.h"
+#include "key_scanner.h"
 
 i2c_slave_config_t slaveConfig;
 i2c_slave_handle_t slaveHandle;
@@ -82,6 +83,7 @@ void InitLedDriver(void)
 void InitPeripherals(void)
 {
     InitInterruptPriorities();
+    InitKeyScanner();
     InitLedDriver();
     InitTestLed();
     LedPwm_Init();
diff --git a/left/src/main.c b/left/src/main.c
index 81e31ed..ca96a9b 100644
--- a/left/src/main.c
+++ b/left/src/main.c
@@ -43,7 +43,7 @@ int main(void)
     KeyMatrix_Init(&keyMatrix);
 
     while (1) {
-        KeyMatrix_Scan(&keyMatrix);
+//        KeyMatrix_Scan(&keyMatrix);
         __WFI();
     }
 }
diff --git a/shared/key_matrix.c b/shared/key_matrix.c
index 1d770df..e59673a 100644
--- a/shared/key_matrix.c
+++ b/shared/key_matrix.c
@@ -18,26 +18,6 @@ void KeyMatrix_Init(key_matrix_t *keyMatrix)
     }
 }
 
-void KeyMatrix_Scan(key_matrix_t *keyMatrix)
-{
-    uint8_t *keyState = keyMatrix->keyStates;
-
-    key_matrix_pin_t *rowEnd = keyMatrix->rows + keyMatrix->rowNum;
-    for (key_matrix_pin_t *row = keyMatrix->rows; row<rowEnd; row++) {
-        GPIO_Type *rowGpio = row->gpio;
-        uint32_t rowPin = row->pin;
-        GPIO_WritePinOutput(rowGpio, rowPin, 1);
-
-        key_matrix_pin_t *colEnd = keyMatrix->cols + keyMatrix->colNum;
-        for (key_matrix_pin_t *col = keyMatrix->cols; col<colEnd; col++) {
-            *(keyState++) = GPIO_ReadPinInput(col->gpio, col->pin);
-        }
-
-        GPIO_WritePinOutput(rowGpio, rowPin, 0);
-        for (volatile uint32_t i=0; i<100; i++); // Wait for the new port state to settle. This avoids bogus key state detection.
-    }
-}
-
 void KeyMatrix_ScanRow(key_matrix_t *keyMatrix)
 {
     uint8_t *keyState = keyMatrix->keyStates + keyMatrix->currentRowNum * keyMatrix->colNum;
diff --git a/shared/key_matrix.h b/shared/key_matrix.h
index d7486b4..e58e12c 100644
--- a/shared/key_matrix.h
+++ b/shared/key_matrix.h
@@ -31,7 +31,6 @@
 // Functions:
 
     void KeyMatrix_Init(key_matrix_t *keyMatrix);
-    void KeyMatrix_Scan(key_matrix_t *keyMatrix);
     void KeyMatrix_ScanRow(key_matrix_t *keyMatrix);
 
 #endif