Clean-up and add missing NamelessROM feature