Remove global references to tree/data