Move (most) remaining functions in ec2 to direct API