Merge "Remove legacy method"