TODO cleanup notification_worker