Remove kissTracking references