Removing tracker, since we're not going to use it
Merge branch 'remove-tracker-support'