I'd bet money on WAR and PLD's getting removed in 8.0, nothing says job identity like an entire role all having the same skill that behaves the exact same way.