removed some irrelevant junk from tracking