Improve AbstractLeader tracker removal