Added cleanup step to authenticator