removed unnecessary tracking