Add new tracker and remove unused code