Remove STI, extract tracker logic into own class.