Cleaned up RescuerTree