Track: code cleanup
Merge pull request #2644 from Wikia/track-cleanup

Track: code cleanup