Get rid of unnecessary None