Cleanup: Already in bcm-common