Update to 0MQ4 + cleanup