Fixup check for no firmware so it uses GetVersions cmd
- Also remove some debugging code