diff --git a/src/components/form/SetEmailPasswordForm.vue b/src/components/form/SetEmailPasswordForm.vue
index 87c0cc8..5843123 100644
--- a/src/components/form/SetEmailPasswordForm.vue
+++ b/src/components/form/SetEmailPasswordForm.vue
@@ -77,7 +77,8 @@ export default class SetPasswordForm extends Vue {
   confirmedPassword = '';
 
   get description () {
-    return this.email ? this.$t('provider.linkPasswordProvider.passwordForm.description', { email: this.email })
+    return this.email
+      ? this.$t('provider.linkPasswordProvider.passwordForm.description', { email: this.email })
       : this.$t('provider.linkPasswordProvider.passwordForm.descriptionNoEmail')
   }
 
diff --git a/src/components/image/upload/SingleValidatedImageUpload.vue b/src/components/image/upload/SingleValidatedImageUpload.vue
index 388514d..1d946d0 100644
--- a/src/components/image/upload/SingleValidatedImageUpload.vue
+++ b/src/components/image/upload/SingleValidatedImageUpload.vue
@@ -18,6 +18,7 @@
 <script lang="ts">
 import { Component, Prop, Ref, Vue, Watch } from 'nuxt-property-decorator'
 import { ValidationProvider } from 'vee-validate'
+import firebase from 'firebase'
 import { ValidationResult } from 'vee-validate/dist/types/types'
 import { Image } from 'types-module'
 import { storage, TaskEvent, TaskState } from '~/plugins/fire-init-plugin'
@@ -83,7 +84,7 @@ export default class SingleFileUploadWithValidation extends Vue {
       this.handleFireStorageError,
       () => {
         return this.uploadTask?.snapshot.ref.getDownloadURL()
-          .then((downloadURL) => {
+          .then((downloadURL:string) => {
             const image: Image = {
               name: this.fileName,
               src: downloadURL,
diff --git a/src/package.json b/src/package.json
index 8ed960b..a0e53d2 100644
--- a/src/package.json
+++ b/src/package.json
@@ -75,7 +75,7 @@
     "cropperjs": "^1.5.9",
     "debounce": "^1.2.0",
     "dotenv": "^8.2.0",
-    "firebase": "^8.1.1",
+    "firebase": "^7.15.5",
     "firebase-admin": "^9.4.1",
     "handlers-module": "file:../functions/modules/handlers-module",
     "http-status-codes": "^2.1.4",
diff --git a/src/server/sitemap.ts b/src/server/sitemap.ts
index 5bdb947..b73bd88 100644
--- a/src/server/sitemap.ts
+++ b/src/server/sitemap.ts
@@ -1,17 +1,6 @@
 import express, { Router } from 'express'
 import { sitemapHandler } from 'handlers-module'
 
-// const staticRoutes = [
-//   Routes.HOME.path,
-//   Routes.TERMS.path,
-//   Routes.PRIVACY_POLICY.path,
-//   Routes.REGISTER.path,
-//   Routes.LOGIN.path,
-//   Routes.CROP.path,
-//   Routes.LIGHT_BOX.path,
-//   Routes.IMAGES.path
-// ]
-
 const app = express()
 app.disable('x-powered-by')
 
diff --git a/src/service/firebase/firebase-service.ts b/src/service/firebase/firebase-service.ts
index 3f88fac..d89ccd8 100644
--- a/src/service/firebase/firebase-service.ts
+++ b/src/service/firebase/firebase-service.ts
@@ -5,14 +5,16 @@ import { auth } from '~/plugins/fire-init-plugin'
 import { DefaultProfilePhoto } from '~/types'
 
 export const getProviderData = (userInfo: UserInfo|null|undefined): ProviderData|null => {
-  return userInfo ? {
-    providerType: userInfo.providerId as ProviderType,
-    displayName: userInfo.displayName,
-    email: userInfo.email,
-    phoneNumber: userInfo.phoneNumber,
-    photoURL: userInfo.photoURL,
-    uid: userInfo.uid
-  } : null
+  return userInfo
+    ? {
+      providerType: userInfo.providerId as ProviderType,
+      displayName: userInfo.displayName,
+      email: userInfo.email,
+      phoneNumber: userInfo.phoneNumber,
+      photoURL: userInfo.photoURL,
+      uid: userInfo.uid
+    }
+    : null
 }
 
 export const getAuthUser = (firebaseUser: User): AuthUser => {
diff --git a/src/service/global-service.ts b/src/service/global-service.ts
index d616db4..bd60bb7 100644
--- a/src/service/global-service.ts
+++ b/src/service/global-service.ts
@@ -7,7 +7,8 @@ import { QueryParameters, Routes, RouteType } from '../types'
 const timestampFormat: string = 'MM/DD/YYYY HH:mm:ss.SSS'
 const slugDelimiter = '-'
 
-export const dashAllRegex = new RegExp('-', 'g')
+export const dashAllRegex = /-/g
+// new RegExp('-', 'g')
 
 export const generateUuid = () => {
   return uuidv4().replace(dashAllRegex, '')
diff --git a/src/service/seo-service.ts b/src/service/seo-service.ts
index d999e4a..1bdcdef 100644
--- a/src/service/seo-service.ts
+++ b/src/service/seo-service.ts
@@ -1,3 +1,4 @@
+import { Vue } from 'nuxt-property-decorator'
 import { DefaultMeta, PageMeta, RouteType } from '~/types'
 
 const getHeadTitle = (routeType: RouteType, vue: Vue) => {
diff --git a/src/shim-ts.d.ts b/src/shim-ts.d.ts
new file mode 100644
index 0000000..9bcae70
--- /dev/null
+++ b/src/shim-ts.d.ts
@@ -0,0 +1,7 @@
+declare namespace Express {
+  export interface Request {
+    user: any;
+    nsSessionId: string;
+    nsRequestId: string;
+  }
+}
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
new file mode 100644
index 0000000..c26285d
--- /dev/null
+++ b/src/shims-vue.d.ts
@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  // @ts-ignore
+  import Vue from 'vue'
+  export default Vue
+}
diff --git a/src/ts-shim.d.ts b/src/ts-shim.d.ts
deleted file mode 100644
index 950fa42..0000000
--- a/src/ts-shim.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-declare namespace Express {
-  export interface Request {
-    user: any;
-    nsSessionId: string;
-    nsRequestId: string;
-  }
-}
-
-declare module '*.vue' {
-  // @ts-ignore
-  import Vue from 'vue'
-  export default Vue
-}
-
-declare module CityDB {
-
-  export interface City {
-    id: number;
-    name: string;
-    latitude: string;
-    longitude: string;
-  }
-
-  export interface State {
-    id: number;
-    name: string;
-    state_code: string;
-    cities: City[];
-  }
-
-  export interface Country {
-    id: number;
-    name: string;
-    iso3: string;
-    iso2: string;
-    phone_code: string;
-    capital: string;
-    currency: string;
-    states: State[];
-  }
-
-}
diff --git a/src/tsconfig.json b/src/tsconfig.json
index b798e8b..fc2f799 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -35,6 +35,7 @@
       "nuxt-i18n",
       "cookie-universal-nuxt",
       "firebase",
+      "firebase/app",
       "nuxt-property-decorator",
       "types-module",
       "handlers-module"