diff --git a/application/src/main/files/examples/altair8800/README b/application/src/main/files/examples/altair8800/README
new file mode 100644
index 000000000..6e3f0d629
--- /dev/null
+++ b/application/src/main/files/examples/altair8800/README
@@ -0,0 +1,13 @@
+Altair 8800 boot loaders:
+
+- boot/mdbl.asm: 88-disk modified boot loader; reverse-engineered from simh emulator
+- boot/dbl.asm : 88-disk boot loader; reverse-engineered from simh emulator
+
+Altair 88-DCDD Floppy disk images can be downloaded at:
+
+- http://schorn.ch/
+- http://simh.trailing-edge.com/kits/ceoaltair.zip
+- http://simh.trailing-edge.com/kits/psaltair.zip
+- http://altairclone.com/support.htm
+- https://deramp.com/downloads/altair/
+
diff --git a/application/src/main/files/examples/altair8800/boot/README b/application/src/main/files/examples/altair8800/boot/README
deleted file mode 100644
index 6d2158b3b..000000000
--- a/application/src/main/files/examples/altair8800/boot/README
+++ /dev/null
@@ -1,5 +0,0 @@
-mdbl.asm: 88-disk modified boot loader; reverse-engineered from simh emulator
-mdbl.bin: 88-disk modified boot loader; extracted from simh emulator
-
-dbl.asm : 88-disk boot loader; reverse-engineered from simh emulator
-dbl.bin : 88-disk boot loader; extracted from simh emulator
diff --git a/application/src/main/files/examples/zx-spectrum/README b/application/src/main/files/examples/zx-spectrum/README
new file mode 100644
index 000000000..6b47dce9e
--- /dev/null
+++ b/application/src/main/files/examples/zx-spectrum/README
@@ -0,0 +1,7 @@
+ZX Spectrum ROM and tape files can be found at:
+
+- https://www.planetemu.net/roms/sinclair-zx-spectrum-z80
+- https://worldofspectrum.org/
+- https://wowroms.com/en/roms/list/zx+spectrum
+- https://mdfs.net/Software/Spectrum/ROMImages/
+
diff --git a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java
index dae8184a7..db0c16328 100644
--- a/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java
+++ b/plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/ContextZ80Impl.java
@@ -24,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;