diff --git a/Caddyfile b/Caddyfile
index b9ca27a..04eb019 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -7,23 +7,5 @@ ai-gateway.ldex.dev {
         output stdout
     }
 
-    # Remove the server signature so Zscaler doesn't know it's a Python app
-    header {
-        -Server
-        Access-Control-Allow-Origin "{header.Origin}"
-        Access-Control-Allow-Methods "GET, POST, OPTIONS"
-        Access-Control-Allow-Headers "*"
-        Access-Control-Expose-Headers "*"
-        Access-Control-Allow-Credentials "true"
-        defer
-    }
-
-    @options {
-        method OPTIONS
-    }
-    handle @options {
-        respond "" 204
-    }
-
     reverse_proxy ai-gateway:8000
 }
diff --git a/app/api/endpoints/gemini.py b/app/api/endpoints/gemini.py
index d9797d5..1c1b332 100644
--- a/app/api/endpoints/gemini.py
+++ b/app/api/endpoints/gemini.py
@@ -140,17 +140,13 @@ async def gemini_chat(
             db.commit()
         
     except Exception as e:
-        import json
-        error_data = {"status": "error", "detail": str(e)}
-        return PlainTextResponse(content=json.dumps(error_data), media_type="text/plain")
+        return {"status": "error", "detail": str(e)}
+
 
     # Final Response
-    import json
-    response_data = {
+    return {
         "status": "success",
         "model": "gemini",
         "response": response.text
     }
-    # We return PlainTextResponse to disguise the JSON from corporate firewalls
-    from fastapi.responses import JSONResponse, FileResponse, PlainTextResponse
-    return PlainTextResponse(content=json.dumps(response_data), media_type="text/plain")
+