diff --git a/index.js b/index.js
index 38869b3..28a1025 100644
--- a/index.js
+++ b/index.js
@@ -2,22 +2,15 @@ import express from 'express'
 import dotenv from 'dotenv'
 import api from './api/api.js'
 import { generateDB } from "./libs/database/generate.js"
-import { sqlite, dbInit } from "./libs/database/init.js"
-import { ddnssStart } from './libs/ddnss/handler.js'
-import tasks from './libs/database/tasks.js'
+import { dbInit } from "./libs/database/init.js"
+
 
 dotenv.config()
 
 dbInit()
-
-const exists = sqlite.prepare(`SELECT count(*) as a FROM sqlite_master WHERE type='table' AND name='points'`).get()
-
-if(!exists.a)
-    generateDB()
+generateDB()
 
 const Server = express()
 Server.use('/api', api)
 
 Server.listen(process.env.PORT, () => console.log(`Server started and listening on port ${process.env.PORT}.`))
-
-//ddnssStart()
\ No newline at end of file
diff --git a/libs/database/generate.js b/libs/database/generate.js
index f629367..7007755 100644
--- a/libs/database/generate.js
+++ b/libs/database/generate.js
@@ -13,6 +13,13 @@ export function generateDB() {
     /* TODO: Clean this up as it is a mess */
     /* TODO: Remove useless ones */
 
+    if (process.env.GENERATE_DB !== "true")
+        return log("Won't generate the database since 'GENERATE_DB' is not set to \"true\" in '.env'!")
+
+    const exists = sqlite.prepare(`SELECT count(*) as a FROM sqlite_master WHERE type='table' AND name='points'`).get()
+    if(!exists.a)
+        return log("Database already generated!")
+
     log("Generating map index...")
     execMany([
         `CREATE INDEX IF NOT EXISTS "idx_maps_map" ON "maps" ("map")`,