Added client callback clean-up demo