Fixed client removal