Merge "Code clean of tm_predictor_32x32"