diff --git a/.eslintrc.json b/.eslintrc.json
index 60a1ce52..92a27e24 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,5 +10,5 @@
     "no-console": "warn",
     "quotes": ["error", "single"]
   },
-  "ignorePatterns": ["dist/**/*"]
+  "ignorePatterns": ["dist/**/*", "src/middlewares/passport-setup.ts"]
 }
diff --git a/src/app.ts b/src/app.ts
index e682e6e3..fdbca257 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -42,14 +42,17 @@ app.use(
 );
 
 // register regenerate & save after the cookieSession middleware initialization
+interface CallbackFunction {
+  (err?: string): void;
+}
 app.use(function (request: Request, response: Response, next: NextFunction) {
   if (request.session && !request.session.regenerate) {
-    request.session.regenerate = (cb: any) => {
+    request.session.regenerate = (cb: CallbackFunction) => {
       cb();
     };
   }
   if (request.session && !request.session.save) {
-    request.session.save = (cb: any) => {
+    request.session.save = (cb: CallbackFunction) => {
       cb();
     };
   }
diff --git a/src/database/models/userModel.ts b/src/database/models/userModel.ts
index 1662406d..b22d5330 100644
--- a/src/database/models/userModel.ts
+++ b/src/database/models/userModel.ts
@@ -20,13 +20,13 @@ export class UserModel {
   @Column({ nullable: true })
   googleId: string;
 
-  @Column({ default: null })
+  @Column({ nullable: true })
   facebookId: string;
 
-  @Column({ default: null })
+  @Column({ nullable: true })
   picture: string;
 
-  @Column({ default: null })
+  @Column({ nullable: true })
   provider: string;
 
   @Column({ default: 'buyer' })
diff --git a/src/middlewares/passport-setup.ts b/src/middlewares/passport-setup.ts
index ea50887a..ba69a00e 100644
--- a/src/middlewares/passport-setup.ts
+++ b/src/middlewares/passport-setup.ts
@@ -1,12 +1,10 @@
-import passport, { use } from 'passport';
+import passport from 'passport';
 import GooglePassport from 'passport-google-oauth20';
 import FacebookPassport from 'passport-facebook';
 import dbConnection from '../database';
 import { UserModel } from '../database/models';
 import dotenv from 'dotenv';
 dotenv.config();
-import sendEmail from '../emails/index';
-import jwt from 'jsonwebtoken';
 
 const userRepository = dbConnection.getRepository(UserModel);