small tracker cleanup