Improved track removal procedure