Remove remaining references to BROMAGIC