strip out more client specific things