Client: Fix cleanup of timeout events