Removed unused tracking code