Re-work client drop (protocols.py)