Removed manual selection of PV or HVM mode - now will detect from PV_bootloader or HVM_bootloader.
Removed .orig files that got saved somehow.