Started removal of MBR relocation code