Replace none() with discard() (#2377)

Replace none() with discard() (#2377) #477