diff --git a/src/utils/getDB.js b/src/utils/getDB.js
deleted file mode 100644
index 54c3ad4..0000000
--- a/src/utils/getDB.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const DB = require('../v1/data/data.json');
-const DB_DEV = require('../v1/data/data-dev.json');
-
-function getDB(dev) {
-  if (dev === 'true') {
-    return DB_DEV;
-  } else {
-    return DB;
-  }
-}
-
-module.exports = getDB;
diff --git a/src/v1/data/Districts.js b/src/v1/data/Districts.js
index dd5aed7..86e679f 100644
--- a/src/v1/data/Districts.js
+++ b/src/v1/data/Districts.js
@@ -164,16 +164,6 @@ exports.getExactDistrict = function (id, fields) {
 
     const district = data.find((item) => item.id === +id);
 
-    // const districtNeighborhoods = neighborhoods.filter(
-    //   (neighborhood) => neighborhood.districtId === district.id,
-    // );
-    // district.neighborhoods = districtNeighborhoods;
-
-    // const districtVillages = villages.filter(
-    //   (village) => village.districtId === district.id,
-    // );
-    // district.villages = districtVillages;
-
     const districtNeighborhoods = neighborhoods
       .filter((neighborhood) => neighborhood.districtId === district.id)
       .map(({ id, name, population }) => ({ id, name, population }));
diff --git a/src/v1/data/Provinces.js b/src/v1/data/Provinces.js
index 30bd2fe..42348a8 100644
--- a/src/v1/data/Provinces.js
+++ b/src/v1/data/Provinces.js
@@ -189,40 +189,26 @@ exports.getExactProvince = function (id, fields, extend) {
     const provinceDistricts = districts.filter(
       (district) => district.provinceId === province.id,
     );
-    // console.log(provinceDistricts);
-    // province.districts = provinceDistricts;
-
-    // if (extend === 'true') {
-    //   province.districts.forEach((district) => {
-    //     const districtNeighborhoods = neighborhoods.filter(
-    //       (neighborhood) => neighborhood.districtId === district.id,
-    //     );
-    //     district.neighborhoods = districtNeighborhoods;
-
-    //     const districtVillages = villages.filter(
-    //       (village) => village.districtId === district.id,
-    //     );
-    //     district.villages = districtVillages;
-    //   });
-    // }
 
     province.districts = provinceDistricts.map(
       ({ id, name, population, area }) => ({ id, name, population, area }),
     );
 
-    province.districts.forEach((district) => {
-      const districtNeighborhoods = neighborhoods
-        .filter((neighborhood) => neighborhood.districtId === district.id)
-        .map(({ id, name, population }) => ({ id, name, population }));
+    if (extend === 'true') {
+      province.districts.forEach((district) => {
+        const districtNeighborhoods = neighborhoods
+          .filter((neighborhood) => neighborhood.districtId === district.id)
+          .map(({ id, name, population }) => ({ id, name, population }));
 
-      district.neighborhoods = districtNeighborhoods;
+        district.neighborhoods = districtNeighborhoods;
 
-      const districtVillages = villages
-        .filter((village) => village.districtId === district.id)
-        .map(({ id, name, population }) => ({ id, name, population }));
+        const districtVillages = villages
+          .filter((village) => village.districtId === district.id)
+          .map(({ id, name, population }) => ({ id, name, population }));
 
-      district.villages = districtVillages;
-    });
+        district.villages = districtVillages;
+      });
+    }
 
     if (fields) {
       const fieldsArray = fields.split(',');