[Fixes #81965260] Cleanup code
Merge pull request #84 from rafkhan/s3-cleanup

[Fixes #81965260] Cleanup S3 code