some clean and CPU tracking bug removing