Remove tracking etc..
Change-Id: I58588d03c4e265d6f7b42ae3339769e1c918b2f8
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d (cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)