remove notify statements