cleanup tree from xiaomi merge