Removed hardcoded references to AWS S3 buckets
Corrected references to keep S3 buckets