cleanup and missing stat couter match