Removed deprecated tracking (now upstream)