Cleanup tracking sample headers