diff --git a/microservices/S3Bucket/Helpers/AWSS3BucketHelper.cs b/microservices/S3Bucket/Helpers/AWSS3BucketHelper.cs
index 2f20ca6..5a29c78 100644
--- a/microservices/S3Bucket/Helpers/AWSS3BucketHelper.cs
+++ b/microservices/S3Bucket/Helpers/AWSS3BucketHelper.cs
@@ -6,7 +6,6 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using System.Collections.Specialized;
-using System.Net;
 
 namespace OnlineAssessment.Helpers
 {
@@ -98,30 +97,12 @@ namespace OnlineAssessment.Helpers
 
         public async Task<Stream> GetFile(string key)
         {
-
-            try
-            {
-                string file = key.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ? key : key + ".png";
-                string filename_print = _settings.AWSS3.BucketName + file;
-
-                var response = await _amazonS3.GetObjectAsync(_settings.AWSS3.BucketName, file);
-
-                if (response.HttpStatusCode == HttpStatusCode.OK)
-                    return response.ResponseStream;
-
+            string file = key + ".png";
+            GetObjectResponse response = await _amazonS3.GetObjectAsync(_settings.AWSS3.BucketName, file);
+            if (response.HttpStatusCode == System.Net.HttpStatusCode.OK)
+                return response.ResponseStream;
+            else
                 return null;
-            }
-            catch (AmazonS3Exception ex)
-            {
-                Console.WriteLine($"AWS S3 Error: {ex.Message} ({ex.ErrorCode})");
-                throw;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"General Error: {ex.Message}");
-                throw;
-            }
-
         }
 
         public async Task<bool> DeleteFile(string key)
diff --git a/microservices/_layers/common/StartupExtensions.cs b/microservices/_layers/common/StartupExtensions.cs
index 82087cd..c690c33 100644
--- a/microservices/_layers/common/StartupExtensions.cs
+++ b/microservices/_layers/common/StartupExtensions.cs
@@ -15,12 +15,11 @@ namespace OnlineAssessment
         {
 
             string connString1 = @"Server=94.249.213.139;Database=OA_STAGING;User Id=sa;Password=Odiware@1234!;TrustServerCertificate=True;MultipleActiveResultSets=true";
-            //string connection1 = AesEncryptionHelper.Encrypt(connString1);
+            string connection1 = AesEncryptionHelper.Encrypt(connString1);
 
 
-            //string connString = configuration.GetConnectionString("DefaultConnectionString");
-            //string connection = AesEncryptionHelper.Decrypt(connString);
-            string connection = connString1;
+            string connString = configuration.GetConnectionString("DefaultConnectionString");
+            string connection = AesEncryptionHelper.Decrypt(connString);
 
             //============================================