More IKEv2 SA work.. simplifying a lot of stuff