Remove deprecated & simplify the getOrElse