[Master] Refactor drive code to rm drivebootstrap and use new conventions