better logging, remove unneeded signalling queues, clean dead code