misc cleanup of commtrack file
Merge pull request #3272 from dimagi/cleanup

misc cleanup of commtrack file