Clean up tracker code - remove some vestigial code