diff --git a/ROMFS/px4fmu_common/init.d/rc.logging b/ROMFS/px4fmu_common/init.d/rc.logging
index 1e4c2e7716777ffda65f656d6f3d699c0bbff1d7..b1aacdf766bba832c137bbeaf4282f798c86f5fd 100644
--- a/ROMFS/px4fmu_common/init.d/rc.logging
+++ b/ROMFS/px4fmu_common/init.d/rc.logging
@@ -4,8 +4,6 @@
 # NOTE: Script variables are declared/initialized/unset in the rcS script.
 #
 
-set LOGGER_ARGS ""
-
 if param greater UAVCAN_ENABLE 1
 then
 	# Reduce logger buffer to free up some RAM for UAVCAN servers.
@@ -26,11 +24,4 @@ then
 	set LOGGER_ARGS "-f"
 fi
 
-if ver hwcmp INTEL_AEROFC_V1
-then
-	set LOGGER_ARGS "-m mavlink"
-fi
-
 logger start -b ${LOGGER_BUF} -t ${LOGGER_ARGS}
-
-unset LOGGER_ARGS
diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors
index a91d17401a22b4674466ffdcac4f2304ae141b61..5b87bc5495357740eaa57da7044553bd10e81779 100644
--- a/ROMFS/px4fmu_common/init.d/rc.sensors
+++ b/ROMFS/px4fmu_common/init.d/rc.sensors
@@ -31,19 +31,6 @@ then
 	adc start
 fi
 
-if ver hwcmp INTEL_AEROFC_V1
-then
-	ms5611 -T 0 start
-	mpu9250 -s -R 14 start
-
-	# Possible external compasses
-	hmc5883 -X start
-
-	ist8310 -C -b 1 -R 4 start
-	aerofc_adc start
-	ll40ls start i2c
-fi
-
 if ver hwcmp GUMSTIX_AEROCORE2
 then
 	l3gd20 -R 12 start
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 21e783f8506d6af519b85d2375986cf293e03b35..86c801266d6992de011a17788392616dbd5f4c3d 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -33,6 +33,7 @@ set FMU_MODE pwm
 set IOFW "/etc/extras/px4_io-v2_default.bin"
 set IO_PRESENT no
 set LOG_FILE /fs/microsd/bootlog.txt
+set LOGGER_ARGS ""
 set LOGGER_BUF  14
 set MAV_TYPE none
 set MIXER none
@@ -142,6 +143,7 @@ else
 	# Waypoint storage.
 	# REBOOTWORK this needs to start in parallel.
 	#
+	# TODO: fix board override $DATAMAN_OPT
 	dataman start $DATAMAN_OPT
 
 	#
@@ -228,20 +230,6 @@ else
 		set DATAMAN_OPT "-f /fs/mtd_dataman"
 	fi
 
-	if ver hwcmp INTEL_AEROFC_V1
-	then
-		if param compare SYS_AUTOSTART 0
-		then
-			set AUTOCNF yes
-		fi
-
-		# We don't allow changing AUTOSTART as it doesn't work in
-		# other configurations.
-		param set SYS_AUTOSTART 4070
-
-		set DATAMAN_OPT -i
-	fi
-
 	if ver hwcmp BITCRAZE_CRAZYFLIE
 	then
 		if param compare SYS_AUTOSTART 0
@@ -509,6 +497,7 @@ unset FMU_MODE
 unset IOFW
 unset IO_PRESENT
 unset LOG_FILE
+unset LOGGER_ARGS
 unset LOGGER_BUF
 unset MAV_TYPE
 unset MIXER