clean up old ec2 code