Move most of the firewall back to security class