Improve the cleanup. Still some to do.
Do not create a ZMQ sub if it is not required.