cleanning code of tuple tracking