diff --git a/libs/common/src/database/database.module.ts b/libs/common/src/database/database.module.ts
index bfda450..ef5a0a1 100644
--- a/libs/common/src/database/database.module.ts
+++ b/libs/common/src/database/database.module.ts
@@ -11,8 +11,6 @@ import { PermissionTypeEntity } from '../modules/permission/entities';
 import { SpaceEntity } from '../modules/space/entities';
 import { SpaceTypeEntity } from '../modules/space-type/entities';
 import { UserSpaceEntity } from '../modules/user-space/entities';
-import { GroupEntity } from '../modules/group/entities';
-import { GroupDeviceEntity } from '../modules/group-device/entities';
 import { DeviceUserPermissionEntity } from '../modules/device-user-permission/entities';
 import { UserRoleEntity } from '../modules/user-role/entities';
 import { RoleTypeEntity } from '../modules/role-type/entities';
@@ -43,8 +41,6 @@ import { DeviceNotificationEntity } from '../modules/device-notification/entitie
           SpaceEntity,
           SpaceTypeEntity,
           UserSpaceEntity,
-          GroupEntity,
-          GroupDeviceEntity,
           DeviceUserPermissionEntity,
           UserRoleEntity,
           RoleTypeEntity,
diff --git a/libs/common/src/modules/device/entities/device.entity.ts b/libs/common/src/modules/device/entities/device.entity.ts
index 3389fec..3a46e07 100644
--- a/libs/common/src/modules/device/entities/device.entity.ts
+++ b/libs/common/src/modules/device/entities/device.entity.ts
@@ -1,7 +1,6 @@
 import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { DeviceDto } from '../dtos/device.dto';
-import { GroupDeviceEntity } from '../../group-device/entities';
 import { SpaceEntity } from '../../space/entities';
 import { ProductEntity } from '../../product/entities';
 import { DeviceUserPermissionEntity } from '../../device-user-permission/entities';
@@ -41,11 +40,6 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
     },
   )
   deviceUserNotification: DeviceNotificationEntity[];
-  @OneToMany(
-    () => GroupDeviceEntity,
-    (userGroupDevices) => userGroupDevices.device,
-  )
-  userGroupDevices: GroupDeviceEntity[];
 
   @ManyToOne(() => SpaceEntity, (space) => space.devicesSpaceEntity, {
     nullable: true,
diff --git a/libs/common/src/modules/group-device/dtos/group.device.dto.ts b/libs/common/src/modules/group-device/dtos/group.device.dto.ts
deleted file mode 100644
index 1a4d51c..0000000
--- a/libs/common/src/modules/group-device/dtos/group.device.dto.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class GroupDeviceDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public deviceUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public groupUuid: string;
-}
diff --git a/libs/common/src/modules/group-device/dtos/index.ts b/libs/common/src/modules/group-device/dtos/index.ts
deleted file mode 100644
index 66bc84a..0000000
--- a/libs/common/src/modules/group-device/dtos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './group.device.dto';
diff --git a/libs/common/src/modules/group-device/entities/group.device.entity.ts b/libs/common/src/modules/group-device/entities/group.device.entity.ts
deleted file mode 100644
index 8a39dc7..0000000
--- a/libs/common/src/modules/group-device/entities/group.device.entity.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
-import { GroupDeviceDto } from '../dtos';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { DeviceEntity } from '../../device/entities';
-import { GroupEntity } from '../../group/entities';
-
-@Entity({ name: 'group-device' })
-@Unique(['device', 'group'])
-export class GroupDeviceEntity extends AbstractEntity<GroupDeviceDto> {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
-    nullable: false,
-  })
-  public uuid: string;
-
-  @Column({
-    type: 'string',
-    nullable: false,
-  })
-  deviceUuid: string;
-
-  @Column({
-    type: 'string',
-    nullable: false,
-  })
-  groupUuid: string;
-
-  @ManyToOne(() => DeviceEntity, (device) => device.userGroupDevices, {
-    nullable: false,
-  })
-  device: DeviceEntity;
-
-  @ManyToOne(() => GroupEntity, (group) => group.groupDevices, {
-    nullable: false,
-  })
-  group: GroupEntity;
-
-  @Column({
-    nullable: true,
-    default: true,
-  })
-  public isActive: boolean;
-  constructor(partial: Partial<GroupDeviceEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}
diff --git a/libs/common/src/modules/group-device/entities/index.ts b/libs/common/src/modules/group-device/entities/index.ts
deleted file mode 100644
index 6b96f11..0000000
--- a/libs/common/src/modules/group-device/entities/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './group.device.entity';
diff --git a/libs/common/src/modules/group-device/group.device.repository.module.ts b/libs/common/src/modules/group-device/group.device.repository.module.ts
deleted file mode 100644
index a3af56d..0000000
--- a/libs/common/src/modules/group-device/group.device.repository.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { GroupDeviceEntity } from './entities/group.device.entity';
-
-@Module({
-  providers: [],
-  exports: [],
-  controllers: [],
-  imports: [TypeOrmModule.forFeature([GroupDeviceEntity])],
-})
-export class GroupDeviceRepositoryModule {}
diff --git a/libs/common/src/modules/group-device/repositories/group.device.repository.ts b/libs/common/src/modules/group-device/repositories/group.device.repository.ts
deleted file mode 100644
index 472c5aa..0000000
--- a/libs/common/src/modules/group-device/repositories/group.device.repository.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { GroupDeviceEntity } from '../entities/group.device.entity';
-
-@Injectable()
-export class GroupDeviceRepository extends Repository<GroupDeviceEntity> {
-  constructor(private dataSource: DataSource) {
-    super(GroupDeviceEntity, dataSource.createEntityManager());
-  }
-}
diff --git a/libs/common/src/modules/group-device/repositories/index.ts b/libs/common/src/modules/group-device/repositories/index.ts
deleted file mode 100644
index 2b40191..0000000
--- a/libs/common/src/modules/group-device/repositories/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './group.device.repository';
diff --git a/libs/common/src/modules/group/dtos/group.dto.ts b/libs/common/src/modules/group/dtos/group.dto.ts
deleted file mode 100644
index d3696b8..0000000
--- a/libs/common/src/modules/group/dtos/group.dto.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class GroupDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public groupName: string;
-}
diff --git a/libs/common/src/modules/group/dtos/index.ts b/libs/common/src/modules/group/dtos/index.ts
deleted file mode 100644
index ba43fbc..0000000
--- a/libs/common/src/modules/group/dtos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './group.dto';
diff --git a/libs/common/src/modules/group/entities/group.entity.ts b/libs/common/src/modules/group/entities/group.entity.ts
deleted file mode 100644
index 525f84d..0000000
--- a/libs/common/src/modules/group/entities/group.entity.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Column, Entity, OneToMany } from 'typeorm';
-import { GroupDto } from '../dtos';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { GroupDeviceEntity } from '../../group-device/entities';
-
-@Entity({ name: 'group' })
-export class GroupEntity extends AbstractEntity<GroupDto> {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
-    nullable: false,
-  })
-  public uuid: string;
-
-  @Column({
-    nullable: false,
-  })
-  public groupName: string;
-
-  @OneToMany(() => GroupDeviceEntity, (groupDevice) => groupDevice.group, {
-    cascade: true,
-  })
-  groupDevices: GroupDeviceEntity[];
-
-  @Column({
-    nullable: true,
-    default: true,
-  })
-  public isActive: boolean;
-  constructor(partial: Partial<GroupEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}
diff --git a/libs/common/src/modules/group/entities/index.ts b/libs/common/src/modules/group/entities/index.ts
deleted file mode 100644
index 50f4201..0000000
--- a/libs/common/src/modules/group/entities/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './group.entity';
diff --git a/libs/common/src/modules/group/group.repository.module.ts b/libs/common/src/modules/group/group.repository.module.ts
deleted file mode 100644
index 5b711e5..0000000
--- a/libs/common/src/modules/group/group.repository.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { GroupEntity } from './entities/group.entity';
-
-@Module({
-  providers: [],
-  exports: [],
-  controllers: [],
-  imports: [TypeOrmModule.forFeature([GroupEntity])],
-})
-export class GroupRepositoryModule {}
diff --git a/libs/common/src/modules/group/repositories/group.repository.ts b/libs/common/src/modules/group/repositories/group.repository.ts
deleted file mode 100644
index 824d671..0000000
--- a/libs/common/src/modules/group/repositories/group.repository.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { DataSource, Repository } from 'typeorm';
-import { Injectable } from '@nestjs/common';
-import { GroupEntity } from '../entities/group.entity';
-
-@Injectable()
-export class GroupRepository extends Repository<GroupEntity> {
-  constructor(private dataSource: DataSource) {
-    super(GroupEntity, dataSource.createEntityManager());
-  }
-}
diff --git a/libs/common/src/modules/group/repositories/index.ts b/libs/common/src/modules/group/repositories/index.ts
deleted file mode 100644
index 7018977..0000000
--- a/libs/common/src/modules/group/repositories/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './group.repository';