Remove & Fix Tracking