Clean client references