Fix tree to properly remove collection.tracking handle