Removed references to AWS