More cleanup
Get rid of the tail tracker