Cleanup IKEv2 code so it builds again