Replace Some/None usage with Option.

if (x == null) Some(x) else None expression is equivalent to Option(x). In addition, due to scala.concurrent._ import, scala.concurrent.Future usage is redundant.