Remove unused variables from core files and fix unused BROADCOM_OUI3

Remove unused variables from core files.
Fix duplicated use of BROADCOM_OUI2, leaving BROADCOM_OUI3 unused.