diff --git a/server/src/configs/custom-environment-variables.json b/server/src/configs/custom-environment-variables.json
index 339c1d088..b0c2c648a 100644
--- a/server/src/configs/custom-environment-variables.json
+++ b/server/src/configs/custom-environment-variables.json
@@ -917,14 +917,6 @@
       "gymBadgeTableName": "DATABASE_SETTINGS_GYM_BADGE_TABLE_NAME",
       "sessionTableName": "DATABASE_SETTINGS_SESSION_TABLE_NAME",
       "migrationTableName": "DATABASE_SETTINGS_MIGRATION_TABLE_NAME",
-      "joinGymBadgeTable": {
-        "__name": "DATABASE_SETTINGS_JOIN_GYM_BADGE_TABLE",
-        "__format": "boolean"
-      },
-      "hideOldQuests": {
-        "__name": "DATABASE_SETTINGS_HIDE_OLD_QUESTS",
-        "__format": "boolean"
-      },
       "maxConnections": {
         "__name": "DATABASE_SETTINGS_MAX_CONNECTIONS",
         "__format": "number"
diff --git a/server/src/configs/default.json b/server/src/configs/default.json
index 5d477b61d..e7e4cac3f 100644
--- a/server/src/configs/default.json
+++ b/server/src/configs/default.json
@@ -449,8 +449,6 @@
       "gymBadgeTableName": "gymBadges",
       "sessionTableName": "session",
       "migrationTableName": "knex_migrations",
-      "joinGymBadgeTable": false,
-      "hideOldQuests": false,
       "maxConnections": 10
     },
     "schemas": []
diff --git a/server/src/models/Pokestop.js b/server/src/models/Pokestop.js
index c929a9002..a20f5f0c8 100644
--- a/server/src/models/Pokestop.js
+++ b/server/src/models/Pokestop.js
@@ -11,7 +11,6 @@ const {
     stopValidDataLimit,
     hideOldPokestops,
   },
-  database: { settings },
   map,
 } = require('../services/config')
 
@@ -75,7 +74,7 @@ module.exports = class Pokestop extends Model {
       ts,
       midnight: clientMidnight,
     } = args
-    const midnight = settings.hideOldQuests ? clientMidnight || 0 : 0
+    const midnight = clientMidnight || 0
     const safeTs = ts || Math.floor(new Date().getTime() / 1000)
 
     const {
@@ -1113,7 +1112,7 @@ module.exports = class Pokestop extends Model {
 
   static async searchQuests(perms, args, { isMad, hasAltQuests }, distance) {
     const { search, onlyAreas = [], locale, midnight: clientMidnight } = args
-    const midnight = settings.hideOldQuests ? clientMidnight : 0
+    const midnight = clientMidnight || 0
 
     const pokemonIds = Object.keys(Event.masterfile.pokemon).filter((pkmn) =>
       i18next
diff --git a/src/components/markers/pokemon.jsx b/src/components/markers/pokemon.jsx
index d1a111111..2fe292fdd 100644
--- a/src/components/markers/pokemon.jsx
+++ b/src/components/markers/pokemon.jsx
@@ -53,7 +53,7 @@ export const fancyMarker = (
       {pkmn.seen_type === 'nearby_cell' && (
         <img
           src={Icons.getMisc('grass')}
-          alt='nearby_cell'
+          alt="nearby_cell"
           style={{
             width: size / 1.5,
             height: 'auto',
diff --git a/src/components/tiles/Pokemon.jsx b/src/components/tiles/Pokemon.jsx
index 0b137079c..3fb755d4b 100644
--- a/src/components/tiles/Pokemon.jsx
+++ b/src/components/tiles/Pokemon.jsx
@@ -126,7 +126,11 @@ const PokemonTile = ({
         zIndexOffset={item.iv * 100}
         position={finalLocation}
         icon={
-          pvpCheck || glowStatus || ivCircle || weatherCheck || item.seen_type === 'nearby_cell'
+          pvpCheck ||
+          glowStatus ||
+          ivCircle ||
+          weatherCheck ||
+          item.seen_type === 'nearby_cell'
             ? fancyMarker(
                 url,
                 size,