init: cleanup

* evita only has two cores
* cleanup stuff