Client >> FrameLimiter, Code Cleanup