Sorry just to clarify, when running the installer from the ISO image the raspi-firmware is being installed.
Can confirm upon first login to the newly installed system tuning apt purge removes the offending files. This has been confirmed by running find to look for any files that contain the string raspi prior to running apt purge then after running apt purge.