Cleanup, support for >4 cpus, fixed netbar delay having an effect on scaling