Remove some commented dead code
Refactor nes to hold pointers to units