Replace none() with discard()

Replace none() with discard() #1754