diff --git a/config/sources/amd64.conf b/config/sources/amd64.conf
index bfbd948d19..5909fb70e5 100644
--- a/config/sources/amd64.conf
+++ b/config/sources/amd64.conf
@@ -23,11 +23,6 @@ declare -g UBOOT_USE_GCC='none'             # required by configuration.sh
 # Defaults, if not set by board or family.
 declare -g KERNEL_IMAGE_TYPE="${KERNEL_IMAGE_TYPE:-"bzImage"}"
 declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"
-#declare -g NAME_KERNEL="${NAME_KERNEL:-""}"
-#declare -g NAME_INITRD="${NAME_INITRD:-""}"
-
-# Default to mainline
-[[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
 
 if [[ "$(uname -m)" == "aarch64" ]]; then
 	# Allow building amd64 on aarch64, but using system toolchain only
diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf
index a5f5aebb0a..b5a05f1277 100644
--- a/config/sources/arm64.conf
+++ b/config/sources/arm64.conf
@@ -31,8 +31,6 @@ if [ "$(uname -m)" = "aarch64" ]; then
 else
 	[[ $ATF_COMPILE != "no" && -z $ATF_COMPILER ]] && ATF_COMPILER="aarch64-none-linux-gnu-"
 	[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER="aarch64-none-linux-gnu-"
-	# > 9.2 https://armbian.atlassian.net/browse/AR-557
-	# [[ -z $KERNEL_COMPILER ]]     && KERNEL_COMPILER="aarch64-none-linux-gnu-"
 	[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-"
 	[[ -z $KERNEL_USE_GCC ]] && KERNEL_USE_GCC='< 9.2'
 fi