diff --git a/src/main/java/com/bamdoliro/maru/application/form/SelectFirstPassUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/SelectFirstPassUseCase.java
index c7fe7508..80d0a985 100644
--- a/src/main/java/com/bamdoliro/maru/application/form/SelectFirstPassUseCase.java
+++ b/src/main/java/com/bamdoliro/maru/application/form/SelectFirstPassUseCase.java
@@ -78,9 +78,9 @@ public void execute() {
         }
 
         formRepository.flush();
-        List<Form> regularOrSupernumeraryFormList = formRepository.findReceivedRegularForm();
+        List<Form> regularFormList = formRepository.findReceivedRegularForm();
 
-        for (Form form : regularOrSupernumeraryFormList) {
+        for (Form form : regularFormList) {
             if (regularCount > 0) {
                 form.firstPass();
                 regularCount--;
diff --git a/src/main/java/com/bamdoliro/maru/application/form/SubmitFinalFormUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/SubmitFinalFormUseCase.java
index e478a6d6..38f2ae84 100644
--- a/src/main/java/com/bamdoliro/maru/application/form/SubmitFinalFormUseCase.java
+++ b/src/main/java/com/bamdoliro/maru/application/form/SubmitFinalFormUseCase.java
@@ -4,7 +4,6 @@
 import com.bamdoliro.maru.domain.form.exception.FormAlreadySubmittedException;
 import com.bamdoliro.maru.domain.form.service.FormFacade;
 import com.bamdoliro.maru.domain.user.domain.User;
-import com.bamdoliro.maru.infrastructure.s3.FileService;
 import com.bamdoliro.maru.shared.annotation.UseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,7 +13,6 @@
 public class SubmitFinalFormUseCase {
 
     private final FormFacade formFacade;
-    private final FileService fileService;
 
     @Transactional
     public void execute(User user) {
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/domain/value/Grade.java b/src/main/java/com/bamdoliro/maru/domain/form/domain/value/Grade.java
index 4a7b087b..fab355fa 100644
--- a/src/main/java/com/bamdoliro/maru/domain/form/domain/value/Grade.java
+++ b/src/main/java/com/bamdoliro/maru/domain/form/domain/value/Grade.java
@@ -3,24 +3,14 @@
 import com.bamdoliro.maru.domain.form.domain.type.Certificate;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
-import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Embedded;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)