sniffer updates, remove unneeded functions