removed dirty hardcoding done for ZMQ