Re: EAP method cleanup