Cleaned up last of tracker code.