diff --git a/functions/app.js b/functions/app.js
index f58127f..c26f5da 100644
--- a/functions/app.js
+++ b/functions/app.js
@@ -1,44 +1,45 @@
-const FunctionModules = require('./modules/index');
-const FunctionModules2 = require('./modules2/index');
-const Webhooks = require('./webhooks/index');
-const express = require('express');
-const cors = require('cors');
+const FunctionModules = require("./modules/index");
+const FunctionModules2 = require("./modules2/index");
+const Webhooks = require("./webhooks/index");
+const express = require("express");
+const cors = require("cors");
 
 // WEBHOOKS
 const webhooks = express();
 webhooks.use(cors({ origin: true }));
-webhooks.all('/conferenceEnded', Webhooks.conferenceEnd);
-webhooks.all('/scheduledCleanup', Webhooks.scheduledCleanUp);
-webhooks.all('/ask', Webhooks.ask);
+webhooks.all("/conferenceEnded", Webhooks.conferenceEnd);
+webhooks.all("/scheduledCleanup", Webhooks.scheduledCleanUp);
+webhooks.all("/ask", Webhooks.ask);
+webhooks.all("/userCleanUp", Webhooks.userCleanUp);
 
 // VERSION 1
 const app = express();
 app.use(cors({ origin: true }));
 app.use(FunctionModules.authenticator);
-app.get('/validator/:partyName', FunctionModules.tokenValidator);
-app.get('/refresher/:token', FunctionModules.tokenRefresher);
-app.post('/create', FunctionModules.createRoom);
-app.post('/join', FunctionModules.joinRoom);
-app.post('/message', FunctionModules.sendMessage);
-app.post('/updatePlayer', FunctionModules.updatePlayer);
-app.post('/updateVoxeet', FunctionModules.updateVoxeet);
-app.delete('/leave/:rid/users/:uid', FunctionModules.leaveRoom);
-app.delete('/delete/:rid', FunctionModules.deleteRoom);
-app.put('/updateAdminOnly/:rid/:adminOnly', FunctionModules.updateAdminOnly);
+app.get("/validator/:partyName", FunctionModules.tokenValidator);
+app.get("/refresher/:token", FunctionModules.tokenRefresher);
+app.post("/create", FunctionModules.createRoom);
+app.post("/join", FunctionModules.joinRoom);
+app.post("/message", FunctionModules.sendMessage);
+app.post("/updatePlayer", FunctionModules.updatePlayer);
+app.post("/updateVoxeet", FunctionModules.updateVoxeet);
+app.delete("/leave/:rid/users/:uid", FunctionModules.leaveRoom);
+app.delete("/delete/:rid", FunctionModules.deleteRoom);
+app.put("/updateAdminOnly/:rid/:adminOnly", FunctionModules.updateAdminOnly);
 
 // VERSION 2
 const app2 = express();
 app2.use(cors({ origin: true }));
 app2.use(FunctionModules2.authenticator);
-app2.get('/validator', FunctionModules2.tokenValidator);
-app2.get('/refresher/:token', FunctionModules2.tokenRefresher);
-app2.post('/create', FunctionModules2.createRoom);
-app2.post('/join', FunctionModules2.joinRoom);
-app2.post('/message', FunctionModules2.sendMessage);
-app2.post('/updatePlayer', FunctionModules2.updatePlayer);
-app2.post('/updateVoxeet', FunctionModules2.updateVoxeet);
-app2.delete('/leave/:rid/users/:uid', FunctionModules2.leaveRoom);
-app2.delete('/delete/:rid', FunctionModules2.deleteRoom);
+app2.get("/validator", FunctionModules2.tokenValidator);
+app2.get("/refresher/:token", FunctionModules2.tokenRefresher);
+app2.post("/create", FunctionModules2.createRoom);
+app2.post("/join", FunctionModules2.joinRoom);
+app2.post("/message", FunctionModules2.sendMessage);
+app2.post("/updatePlayer", FunctionModules2.updatePlayer);
+app2.post("/updateVoxeet", FunctionModules2.updateVoxeet);
+app2.delete("/leave/:rid/users/:uid", FunctionModules2.leaveRoom);
+app2.delete("/delete/:rid", FunctionModules2.deleteRoom);
 
 module.exports = {
   v1: app,
diff --git a/functions/webhooks/index.js b/functions/webhooks/index.js
index 7a9465a..41b0420 100644
--- a/functions/webhooks/index.js
+++ b/functions/webhooks/index.js
@@ -1,9 +1,11 @@
-const conferenceEnd = require('./conferenceEnd');
-const scheduledCleanUp = require('./scheduledCleanUp');
-const ask = require('./ask');
+const conferenceEnd = require("./conferenceEnd");
+const scheduledCleanUp = require("./scheduledCleanUp");
+const ask = require("./ask");
+const userClearUp = require("./userCleanUp");
 
 module.exports = {
   conferenceEnd,
   scheduledCleanUp,
   ask,
+  userCleanUp,
 };
diff --git a/functions/webhooks/userCleanUp.js b/functions/webhooks/userCleanUp.js
index 6ea4a89..36a697f 100644
--- a/functions/webhooks/userCleanUp.js
+++ b/functions/webhooks/userCleanUp.js
@@ -1,12 +1,4 @@
 const admin = require("firebase-admin");
-const secret = require("../FirebaseSecret.json");
-
-const FIREBASE_OPTIONS = {
-  credential: admin.credential.cert(secret),
-  databaseURL: "https://watch-party-crx.firebaseio.com",
-};
-
-admin.initializeApp(FIREBASE_OPTIONS);
 
 const timeDiff = (ds1, ds2) => {
   const d1 = new Date(ds1);