diff --git a/conf/machine/include/obmc-bsp-common.inc b/conf/machine/include/obmc-bsp-common.inc
index c402904..7162b5d 100644
--- a/conf/machine/include/obmc-bsp-common.inc
+++ b/conf/machine/include/obmc-bsp-common.inc
@@ -4,11 +4,6 @@
 
 KERNEL_CLASSES ?= "kernel-fitimage"
 KERNEL_IMAGETYPES ?= "fitImage"
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-UBOOT_SUFFIX ?= "bin"
-
-MACHINEOVERRIDES =. "openbmc:"
 
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
         'obmc-ubi-fs', \
@@ -19,6 +14,3 @@
 INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}"
 INITRAMFS_IMAGE ?= "obmc-phosphor-initramfs"
 INITRAMFS_IMAGE_df-obmc-ubi-fs ?= ""
-
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"
-