Align spec with EL7, remove legacy cruft.