diff --git a/src/drivers/boards/tap-v1/CMakeLists.txt b/src/drivers/boards/tap-v1/CMakeLists.txt
index 94a048149d..ac1a95751a 100644
--- a/src/drivers/boards/tap-v1/CMakeLists.txt
+++ b/src/drivers/boards/tap-v1/CMakeLists.txt
@@ -42,7 +42,6 @@ px4_add_module(
 		../common/board_dma_alloc.c
 		tap_init.c
 		tap_pwr.c
-		tap_i2c.cpp
 		tap_sdio.c
 		tap_timer_config.c
 		tap_spi.c
diff --git a/src/drivers/boards/tap-v1/board_config.h b/src/drivers/boards/tap-v1/board_config.h
index aa7ce1cd9d..130d9d7a28 100644
--- a/src/drivers/boards/tap-v1/board_config.h
+++ b/src/drivers/boards/tap-v1/board_config.h
@@ -103,6 +103,11 @@
 #define PX4_I2C_BUS_ONBOARD_HZ      400000
 #define PX4_I2C_BUS_SONAR_HZ        400000
 #define PX4_I2C_BUS_EXPANSION_HZ    400000
+
+#define BOARD_NUMBER_I2C_BUSES  3
+#define BOARD_I2C_BUS_CLOCK_INIT {PX4_I2C_BUS_ONBOARD_HZ, PX4_I2C_BUS_SONAR_HZ, PX4_I2C_BUS_EXPANSION_HZ}
+
+
 /*
  * Devices on the onboard bus.
  *
diff --git a/src/drivers/boards/tap-v1/tap_i2c.cpp b/src/drivers/boards/tap-v1/tap_i2c.cpp
deleted file mode 100644
index 99b288917f..0000000000
--- a/src/drivers/boards/tap-v1/tap_i2c.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (c) 2016 PX4 Development Team. All rights reserved.
- *         Author: David Sidrane <david_s5@nscdg.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/**
- * @file tap_i2c.c
- *
- * TAP_V1 LED backend.
- */
-
-#include <px4_config.h>
-
-
-#include "board_config.h"
-#include <arch/board/board.h>
-#include <drivers/device/i2c.h>
-/****************************************************************************
- * Name: board_i2c_initialize
- *
- * Description:
- *   Called to set I2C bus frequncies.
- *
- ****************************************************************************/
-
-int board_i2c_initialize(void)
-{
-
-	int ret = device::I2C::set_bus_clock(PX4_I2C_BUS_ONBOARD, PX4_I2C_BUS_ONBOARD_HZ);
-
-	if (ret == OK) {
-		ret = device::I2C::set_bus_clock(PX4_I2C_BUS_SONAR, PX4_I2C_BUS_SONAR);
-	}
-
-	if (ret == OK) {
-		ret = device::I2C::set_bus_clock(PX4_I2C_BUS_EXPANSION, PX4_I2C_BUS_EXPANSION_HZ);
-	}
-
-	return ret;
-}
diff --git a/src/drivers/boards/tap-v1/tap_init.c b/src/drivers/boards/tap-v1/tap_init.c
index e06aadd57c..3a8ad90441 100644
--- a/src/drivers/boards/tap-v1/tap_init.c
+++ b/src/drivers/boards/tap-v1/tap_init.c
@@ -370,13 +370,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	led_off(LED_AMBER);
 	led_off(LED_BLUE);
 
-	result = board_i2c_initialize();
-
-	if (result != OK) {
-		led_on(LED_AMBER);
-		return -ENODEV;
-	}
-
 #if defined(FLASH_BASED_PARAMS)
 	static sector_descriptor_t  sector_map[] = {
 		{1, 16 * 1024, 0x08004000},