Remove Matched enum with Option<T>