Remove redundant/unused EC2 code