Removed logging and sniffing