simplifies challenge expiry messages, removes Canceled and Timeout events from Challenge