Strip out ec2 specific calls pending a better more generic solution