diff --git a/.env b/.env
index 27d8d9f..3f1a3c3 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,6 @@
 QSTASH_CURRENT_SIGNING_KEY=khs3lpVBv1QtV/L9MTdXlcnoI8tTlg0aDfrFz+o8utA=
 
 #auth
-FIREBASE_PROJECT_ID=108334318546849571774
-FIREBASE_CLIENT_EMAIL=firebase-adminsdk-30mf4@radio-otherway.iam.gserviceaccount.com
-FIREBASE_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCCUpIHFRRlpmU\nj/4q681t5J3Z+p7NFnAKY4ze+Jn/9nN2eNHZOonHJfRJcKoGYOySOtkG27flU1P6\nrV8uoFGGeBVNMXb48qouvbBHkjps8lQi5+uMVuiKJFDa/VBLJ2pVpLEGd56Uy0Au\nF1e00yoQdtVAnuPWUthRM3U/FgaILaOh4tkf8Kgk8/d+IGlkYeQYQGQZQsx64LfH\nA0O+yXOmOa8y9HHoeHvNXHFdHcbZXAlgQ4Qf+A9PshCGvJL0jRQMvk42dBzGqhI4\ngbcTsSvjGHCGLLRFqSj4cTUP2307QsSTPmksIAEmssxahGTzThnpTWSVRMijUwho\nHU+x8zIZAgMBAAECggEAC6CROMioeCp38dzpDvsKAy5NE+KpQRfkRzMXnhrekOXc\nnbpNX4uFoGSSrWiYv6tvhwRgvJZOVZR3NqZ3Std6MH53TvoKVjj7CrRSNmUO/Df5\n47eVuAH94Ef0fRLrN1MEKQqmkwEjBGk443+Blskv6ZmoBhMfYFie3srLGVMsDrKM\nC3hESO8LGqQo6DiZJTLHQIiLR8WcT3nf40n955dexGxj5Itfpe9N+E54xiXgSGzb\nJ7EHYZ3jhtvvoQkw5YBJ0nVu8sALdtIvjWl9Wv14weTKnnnDi8IIAtfi1FBr/Nii\ntLME7UIPI0+/HPuWKQM/RTfooEhKUShFDNTovw+0yQKBgQDkUXuMC6DYefpKn/EK\nmZPP7iBQd0VQGaHfZNhxbypRg+ntQiORMLseLqn4aAeOhRd5Li5v4OY3JvlgQskr\nBxWqsgQpRqm8NnoG0tP4HsZI5SPk4ibnQZYbAaa8dnahbSxIxd19sCYf34huMg83\nLC192Na+7+Xegb3moP8ufjDq5QKBgQDZj8RDRwF8kzgcP2DgqzG98gM7lSfMNNzj\nlb+07ZLKJSXVJ0MjUZV/zZ/r6uhoszFT8CUF/lfbTfITVy6LuXT6gnaxVl+ennyH\nJfHhpfn+ccoNub+X1TMyJqUTOzcOVERh92YM8JBZXyPdaOSS8QbiwwVDtjzm+RiG\nQcI7lUVTJQKBgQDX583jMyPZUg/D/dec5HoIyPA552/ePT7714tuSWdFSm8t87ta\nkzB/bDVDOGzc8zKtX2R+W7iYMvzjcIR3ce2lS03wEmh0GTfvt/LG0aNET5tP2CRd\nz4G47CjWU1f/cxPLhYDcWHTU8zc6rZAB5n7mYOVCDe3cKeiAbYKiXqa3mQKBgFIE\n7CW86CeRzM6BakFo6NjGG0fkJFvM9hVqiBpqkjNZK9ke8yWmhSjoWUj0h2epXohZ\neWu4BmEsEn4OGQMeCKbEdoDGokfHUgUVXgoGq6esOFNSWpOgEavve74zTb8+L4WL\nYlKwgore3kODXuCyszjb8ukjE/SzpfY/Zj1WOgttAoGBAKUh4wfHynLok4MCjyGR\nK8axvVbTitb5WI3GPtK7RHg4UV/GHUfm+i99Fk5qYq9LszjO6MCWQ0VNMBZYZtTr\nwYbpQQAxX4AL4dJpMFOYbYNzv1sGe6/0w4xlvIC90ajgJEnNPyH4iSrHK3DFjckv\nFgMUcGqHCWcyLBaVt8f5nCMf\n-----END PRIVATE KEY-----\n"
 GOOGLE_APPLICATION_CREDENTIALS=radio-otherway-service-account.json
 
 #calendar api
@@ -12,6 +9,4 @@ LIVE_GOOGLE_CALENDAR_ID=geh501qel59lf3505v2huebo18@group.calendar.google.com
 GOOGLE_CALENDAR_ID=7732f7973f574db2638371394769a94aad5e38b98362d528cd985728d98cf3bd@group.calendar.google.com
 
 GOOGLE_CALENDAR_API_KEY=AIzaSyAMvrSrwqvz9o4Y8b-0zneU-REWDIzuKR0
-GOOGLE_CALENDAR_CREDENTIALS_PRIVATE_KEY_ID="d694fded9dca2e36e5974032d458c28edfd40852"
-GOOGLE_CALENDAR_CREDENTIALS_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCaMVP3P+Do/KcZ\np/EH2cbj6bDb0weBcJzAyL8McrmZta8sSizQ63ui6CEcqrFhLVIT49Auzyx7KQcW\n/cu0/gLWUz/uZkbuqhCuYr0EYZWSQgTCdqK/llbxfVaKVDj4/noykqi175UWnRDW\nBG7PU3TeXTVwfH5WSWQq+ZWm9Br0wlR/dYxuAfVKIFJd+PbvvyzQhDDdU4GQdo39\ntKh9h6LJnQs7JxofleYEHAxFiA4gDTkFyV6s6TqG2zcEwWieH3LdH44chHYZuuZC\nVAZ38/Aofva1gYjdkos2OTch9SDKbijaLSYPHDHW0MNWScSIDvcUKULaPFv8Y5nt\nnOiRow0rAgMBAAECggEAH0oRQuQojL7wXclxpOkxbgB3DjSlmkOy24AhHLKPLTzs\nHi2zKHYQsb8vMPUGZ7TdqgGZtlX+LcPml2jLFKBTDRD5sTP6AuZp2ilZN/Fhe7t/\n4cJXRk+Itxp7HDj5ErX5MBgIulqyw1L+Hp/pqJLD7Xe2p2vr6zCbbgkVsDpq2e3g\nuX82oqzSIrrfPpZQDYi0rxOTVVdLc/EUtTc3VDvzaylUBXhSvgV22tOQYds7H+Si\njMsMD6dIZGejiNn+rtLaK3/yEH6iik4XSKNXtDUCBzNbpTkxhk78OOdfAa2ySSM8\naNsNHa/kBoM0W8/+aSjFHYbru5YRJB4IWuUWCO49SQKBgQDJUEqIsm6UhAsgrCDN\nUDXbCnijs75cpt6YYHVlWNNHD2gG8FSz0Smk1TXlwqF85SrKir30cktRHi08AuJ3\nXf38/u9BWFYRs8qELPEgIJ6VrB+i7KLS1X8/Vd6Q+72exwGqyBZGAW9juCmkHiuF\nNTX7ClmaALfoSJ1jOPnX4LG2HwKBgQDEFCl9xvGDFcuLt1Hdg2rcx2gnN+RmDGfh\neTagw70zVvEjp1kQxhzaQArWCkB2kSV9EEZl//TwK+h7KVdvNDR1ufVxbaQVV2S3\nWFfwr9RH1DhPtjhhYawbxhsC/S62JPc7maLNBUg2YwrHiX+gal35ePAvs8+0Kl4V\nbKxw62EPdQKBgQCw3++srQFFUcKpITLs0VWQL2IRisJti1u2C8H5mpJ/M8UVm6EA\nIHzzSzVAusHCB2OSc1Y0aRtNmTLrMCmj8RxQZfj2s9NjWFFN0mLE9IQBQyrErh7d\nGSHlFuAnCFfxIi6Py57uQSKKPeuwO6XHMxpLiCtziMAMwYgu/oddqhjZxwKBgDi2\nzDmBLaIIz9MdtyQnOuWZF9sgI4QQ2osxEEf31eXfo+f4I57ibr4CACBg3rxsxzch\nWftuyV4elSPqlUupAfN7Ui7405kIqi0N9IG9md0c2RzVTAF+ytVNu8pliPlOP+SR\nT7GVcYmppBiLAMtZeM0L2g0yKUWna4cu48HVk0FxAoGBAKCSVvU2yAPKQlFZMjWZ\nf3lZVssPNf1/xSfvnsSqzURN7MzPlQRChZK7XgoAtKARep3vl8Uiti+OnPXCSf0P\nOvq6ckSGQxViVA3xlVTkYFA37CqCsCk5e3pAmv6nFcEnhbWMEIiK1+fEoVYpcMJB\ng8dJPLVOhoUcuGMYFE9KBp3K\n-----END PRIVATE KEY-----\n"
 GOOGLE_CALENDAR_CREDENTIALS_CLIENT_EMAIL="otherway-calendar-proxy@radio-otherway.iam.gserviceaccount.com"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7a3bb46..46153a7 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,9 +6,8 @@ const getData = async () => {
 };
 
 export default async function Home() {
-  const isServer = () => typeof window === `undefined`;
 
-  const results = !isServer() && await getData();
+  const results = await getData();
   return results.message ? (
     <div className="min-h-screen hero bg-base-200">
       <div className="text-center hero-content">
diff --git a/src/lib/auth/firebase.ts b/src/lib/auth/firebase.ts
index ef0e540..e839e21 100644
--- a/src/lib/auth/firebase.ts
+++ b/src/lib/auth/firebase.ts
@@ -3,7 +3,7 @@ import 'firebase/auth';
 import {getFirestore} from "firebase/firestore";
 
 const firebaseConfig = {
-  apiKey: "AIzaSyDtQVcCocVj-baMyBNxhV3Fbi7YXeyTXXE",
+  apiKey: "AIzaSyDtk_Ym-AZroXsHvQVcdHXYyc_TvgycAWw",
   authDomain: "radio-otherway.firebaseapp.com",
   projectId: "radio-otherway",
   storageBucket: "radio-otherway.appspot.com",
diff --git a/src/pages/api/auth/dotdotdot_nextauthdotjs b/src/pages/api/auth/dotdotdot_nextauthdotjs
deleted file mode 100644
index a7deff7..0000000
--- a/src/pages/api/auth/dotdotdot_nextauthdotjs
+++ /dev/null
@@ -1,41 +0,0 @@
-import GoogleProvider from "next-auth/providers/google";
-import TwitterProvider from "next-auth/providers/twitter";
-// import {FirebaseAdapter} from "@next-auth/firebase-adapter"
-import {FirestoreAdapter} from "@next-auth/firebase-adapter";
-import {initializeApp, getApp, getApps} from "firebase/app";
-import {
-  getFirestore
-} from "firebase/firestore";
-import * as firestoreFunctions from 'firebase/firestore'
-import NextAuth from "next-auth";
-
-
-const firebaseConfig = {
-  apiKey: "AIzaSyDtQVcCocVj-baMyBNxhV3Fbi7YXeyTXXE",
-  authDomain: "radio-otherway.firebaseapp.com",
-  projectId: "radio-otherway",
-  storageBucket: "radio-otherway.appspot.com",
-  messagingSenderId: "47147490249",
-  appId: "1:47147490249:web:a84515b3ce1c481826e618",
-  measurementId: "G-12YB78EZM4"
-};
-const app = !getApps().length ? initializeApp(firebaseConfig) : getApp();
-const db = getFirestore();
-
-export const authOptions = {
-  // adapter: PrismaAdapter(prisma),
-  // adapter: FirebaseAdapter({db, ...firestoreFunctions}),
-  adapter: FirestoreAdapter(firebaseConfig),
-  providers: [
-    GoogleProvider({
-      clientId: process.env.GOOGLE_CLIENT_ID, clientSecret: process.env.GOOGLE_CLIENT_SECRET,
-    }),
-    TwitterProvider({
-      clientId: process.env.TWITTER_CLIENT_ID,
-      clientSecret: process.env.TWITTER_CLIENT_SECRET,
-      version: "2.0"
-    }),
-  ],
-};
-
-export default NextAuth(authOptions);