Clean thread filename more aggressively