C3 instantiation code cleanup
Boot class code cleanup