firewall cleanups