Remove legacy method