Continuing to cleanup things
Working on bootstrap compilation