Remove more tracking code