Remove duplicate deliver_messages