added app event cleanup