Shuyang Removed some redundant tracking stuff.