changes to enable the device to boot along with a clean up