Tracker Cleanup

Signed-off-by: Scott Szarapka <scott@szarapka.com>