Revert second emulator addition and test disk space issue