Remove redundant scala.Some imports