Prefer the flapjack broker module, remove references to USING