Remove faulty logic with identifying if already tracking