Move final bits out of Tracker