diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchInfrastructureConfig.java b/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchInfrastructureConfig.java
index 3bf5e08819ce..e1957f901ff4 100644
--- a/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchInfrastructureConfig.java
+++ b/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchInfrastructureConfig.java
@@ -138,9 +138,6 @@ public AlarmMessageSender alarmMessageSender(
         return new DefaultAlarmMessageSender(mailSender, webhookSender, smsSender);
     }
 
-    // ---- 기존 XML(applicationContext-batch-common.xml)에 있던 추가 빈들 ----
-    // 다른 Job들(agentCount, cleanup 등)에서 사용될 수 있으므로 누락 방지 차원에서 등록
-
     @Bean
     public ConfigProperties configProperties() {
         return new ConfigProperties();
@@ -151,7 +148,6 @@ public TransactionTemplate transactionTemplate(PlatformTransactionManager transa
         return new TransactionTemplate(transactionManager);
     }
 
-    //  - sqlSessionFactory (MyBatis core factory)
     @Bean
     public FactoryBean<SqlSessionFactory> sqlSessionFactory(
             @Qualifier("dataSource") DataSource dataSource,
@@ -173,15 +169,13 @@ public FactoryBean<SqlSessionFactory> sqlSessionFactory(
         return sessionFactoryBean;
     }
 
-    //  - sqlSessionTemplate (if a SqlSessionFactory exists in the context)
     @Bean
     public SqlSessionTemplate sqlSessionTemplate(
             @Qualifier("sqlSessionFactory") SqlSessionFactory sessionFactory) {
         return new SqlSessionTemplate(sessionFactory);
     }
 
-    //  - batchSqlSessionTemplate (configured for BATCH executor type)
-    @Bean(name = "batchSqlSessionTemplate")
+    @Bean
     public SqlSessionTemplate batchSqlSessionTemplate(
             @Qualifier("sqlSessionFactory") SqlSessionFactory sessionFactory) {
         return new SqlSessionTemplate(sessionFactory, org.apache.ibatis.session.ExecutorType.BATCH);
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchScheduleConfig.java b/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchScheduleConfig.java
index 641cc9000475..111daa7ae1f2 100644
--- a/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchScheduleConfig.java
+++ b/batch/src/main/java/com/navercorp/pinpoint/batch/config/BatchScheduleConfig.java
@@ -27,12 +27,6 @@
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
 
-/**
- * 기존 applicationContext-batch-schedule.xml 대체
- *
- * Java Configuration 기반 배치 스케줄링 설정
- * BatchJavaConfigModule에 의해 조건부 로드됨
- */
 @Configuration
 @EnableScheduling
 public class BatchScheduleConfig implements SchedulingConfigurer {