Better idle cleanup on client