Merge "Remove Quick from tree."