Remove some dep., fix drops, throttle old clients

and some cleanup