Some cleanup of the AuthClass module