Removing more aws specific code