started cleanup in notifyclient code