Bug789 v1.5 part2

More cleaning of suricata.c. Suri prefix is not used anymore.