add CPUs flag and remove commented code