set eapd and pop immediately at wake regardless of mode used, remove unneeded delays