Remove chat references from original clients