Remove legacy version