cleaned up the firewall stuff a little bit
remove some dead code
removed even more dead code