some cleanup and remove overwriting of device defaults for bgscan and diversity