remove ec2 related queries