diff --git a/server/src/modules/app-permissions/module.ts b/server/src/modules/app-permissions/module.ts
index 704c6c1374..dd2c1d905e 100644
--- a/server/src/modules/app-permissions/module.ts
+++ b/server/src/modules/app-permissions/module.ts
@@ -9,13 +9,18 @@ import { PageUsersRepository } from './repositories/page-users.repository';
 import { PagePermissionsRepository } from './repositories/page-permissions.repository';
 import { PageUser } from '@entities/page_users.entity';
 import { PagePermission } from '@entities/page_permissions.entity';
+import { AppPermissionsController } from './controller';
+import { AppPermissionsService } from './service';
+import { AppPermissionsUtilService } from './util.service';
 
 export class AppPermissionsModule {
   static async register(configs: { IS_GET_CONTEXT: boolean }): Promise<DynamicModule> {
     const importPath = await getImportPath(configs.IS_GET_CONTEXT);
-    const { AppPermissionsController } = await import(`${importPath}/app-permissions/controller`);
-    const { AppPermissionsService } = await import(`${importPath}/app-permissions/service`);
-    const { AppPermissionsUtilService } = await import(`${importPath}/app-permissions/util.service`);
+    // const { AppPermissionsController } = await import(`${importPath}/app-permissions/controller`);
+    // const { AppPermissionsService } = await import(`${importPath}/app-permissions/service`);
+    // const { AppPermissionsUtilService } = await import(`${importPath}/app-permissions/util.service`);
+
+    //Please create EE Files for the above imports and remove static imports
 
     return {
       module: AppPermissionsModule,
diff --git a/server/src/modules/apps/services/app-import-export.service.ts b/server/src/modules/apps/services/app-import-export.service.ts
index 83c99e852e..b9914b0e8a 100644
--- a/server/src/modules/apps/services/app-import-export.service.ts
+++ b/server/src/modules/apps/services/app-import-export.service.ts
@@ -52,7 +52,17 @@ type DefaultDataSourceName =
   | 'tooljetdbdefault'
   | 'workflowsdefault';
 
-type NewRevampedComponent = 'Text' | 'TextInput' | 'PasswordInput' | 'NumberInput' | 'Table' | 'Button' | 'Checkbox' | 'Divider' | 'VerticalDivider' | 'Link';
+type NewRevampedComponent =
+  | 'Text'
+  | 'TextInput'
+  | 'PasswordInput'
+  | 'NumberInput'
+  | 'Table'
+  | 'Button'
+  | 'Checkbox'
+  | 'Divider'
+  | 'VerticalDivider'
+  | 'Link';
 
 const DefaultDataSourceNames: DefaultDataSourceName[] = [
   'restapidefault',
@@ -84,7 +94,7 @@ export class AppImportExportService {
     protected usersUtilService: UsersUtilService,
     protected readonly entityManager: EntityManager,
     protected componentsService: ComponentsService
-  ) { }
+  ) {}
 
   async export(user: User, id: string, searchParams: any = {}, organizationId?: string): Promise<{ appV2: App }> {
     // https://github.com/typeorm/typeorm/issues/3857
@@ -186,13 +196,13 @@ export class AppImportExportService {
       const components =
         pages.length > 0
           ? await manager
-            .createQueryBuilder(Component, 'components')
-            .leftJoinAndSelect('components.layouts', 'layouts')
-            .where('components.pageId IN(:...pageId)', {
-              pageId: pages.map((v) => v.id),
-            })
-            .orderBy('components.created_at', 'ASC')
-            .getMany()
+              .createQueryBuilder(Component, 'components')
+              .leftJoinAndSelect('components.layouts', 'layouts')
+              .where('components.pageId IN(:...pageId)', {
+                pageId: pages.map((v) => v.id),
+              })
+              .orderBy('components.created_at', 'ASC')
+              .getMany()
           : [];
 
       const events = await manager
@@ -1089,10 +1099,10 @@ export class AppImportExportService {
       const options =
         importingDataSource.kind === 'tooljetdb'
           ? this.replaceTooljetDbTableIds(
-            importingQuery.options,
-            externalResourceMappings['tooljet_database'],
-            organizationId
-          )
+              importingQuery.options,
+              externalResourceMappings['tooljet_database'],
+              organizationId
+            )
           : importingQuery.options;
 
       const newQuery = manager.create(DataQuery, {