Retargets, Cleanup, and fixed RateLimit in auth classes.