more clean up, stop crashing firewalld by some async/handler magic (thanks sfromm and skvidal)