Clean up code after upgrade of Suricata packaging