[SecurityBundle] Firewall providers building - code cleaning