NUSE: follow ups of cleanup code