Remove v5.18, as strict as requirements