build fix, plus bringing back the dongle declaration
comment out old code
build fixes