Specific cores are switeched on/off + code cleanup