Remove TBB & fix cmake files