Remove metrics from T2-Client #16