Refactor tracker removal.