Get rid of come CPU selfs in favour of all-this on the hot path