remove client name where unnecessary