Final cleanup on Track/Sector