ADEN-979 Remove old adTracker code
ADEN-979 Indentation fix
Unit tests fix
Merge pull request #3077 from Wikia/aden-979-remove-old-adtracker-code

ADEN-979 Remove old adTracker code