removed message queues and patched /cup