Continues removing unused code from emulator.py