more cleanups,
make PatchZ80 optional