Cleanup in arrivalnotify; log msg + comments