Remove dispatch and untweak ack