moved event resolving to app ; added client deletion