Remove use of Option.get