add notification & cleanup