Merge "Remove unused API tracking files"