Removed ec2 stuff