Cleanup firewall code

Signed-off-by: bjanssens <bjanssens@inuits.eu>