diff --git a/boards/holybro/can-gps-v1/init/rc.board_defaults b/boards/holybro/can-gps-v1/init/rc.board_defaults
index 919d821216..35be49d5b9 100644
--- a/boards/holybro/can-gps-v1/init/rc.board_defaults
+++ b/boards/holybro/can-gps-v1/init/rc.board_defaults
@@ -3,14 +3,4 @@
 # board specific defaults
 #------------------------------------------------------------------------------
 
-
-if [ $AUTOCNF = yes ]
-then
-	# Disable safety switch by default
-	param set CBRK_IO_SAFETY 22027
-
-fi
-
 rgbled_ncp5623c -I -b 1 -a 0x39  start
-
-#safety_button start
diff --git a/boards/holybro/can-gps-v1/src/Makefile b/boards/holybro/can-gps-v1/src/Makefile
deleted file mode 100644
index 1e0b1010e0..0000000000
--- a/boards/holybro/can-gps-v1/src/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#           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 NuttX 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.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-
-CFLAGS		+= -I$(TOPDIR)/sched
-
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-
-ifeq ($(CONFIG_BOOTLOADER),)
-CSRCS		= empty.c
-endif
-ifeq ($(CONFIG_BOOTLOADER),y)
-
-SRC_SEARCH = 	bootloader/can bootloader/src bootloader/common bootloader/uavcan
-
-CSRCS		= ostubs.c
-
-CFLAGS += $(addprefix -I,$(SRC_SEARCH))
-DEPOPTS = $(addprefix --dep-path ,$(SRC_SEARCH))
-VPATH= 	$(SRC_SEARCH)
-endif
-
-COBJS		= $(CSRCS:.c=$(OBJEXT))
-
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
-
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-			   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-			   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
-else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
-endif
-
-all: libboard$(LIBEXT)
-
-$(AOBJS): %$(OBJEXT): %.S
-	$(call ASSEMBLE, $<, $@)
-
-$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(call COMPILE, $<, $@)
-
-libboard$(LIBEXT): $(OBJS)
-	$(call ARCHIVE, $@, $(OBJS))
-
-.depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
-
-depend: .depend
-
-clean:
-	$(call DELFILE, libboard$(LIBEXT))
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, Make.dep)
-	$(call DELFILE, .depend)
-
-ifneq ($(BOARD_CONTEXT),y)
-context:
-endif
-
--include Make.dep