1. Removed more reference to  emu, emulator where not required