Started cleaning up the bootup process