Update removeSecurityGroup() method
Move FirewallPolicy extraction to its own class