Had missed some bootloading conditional functions - now gone