Actually remove the invalids
Add the track number to the thread
Print the right track number