Merge "remove out of date heat references"