More ZeroMQ Cleaning