Misc. eauth cleanup