diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/CommonsHbaseConfiguration.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/CommonsHbaseConfiguration.java
index 097481ea3b5c..0afb6eb21613 100644
--- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/CommonsHbaseConfiguration.java
+++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/CommonsHbaseConfiguration.java
@@ -1,10 +1,8 @@
 package com.navercorp.pinpoint.common.server;
 
-import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatDataPointCodec;
 import com.navercorp.pinpoint.common.server.bo.serializer.stat.config.AgentStatSerializeConfiguration;
 import com.navercorp.pinpoint.common.server.bo.serializer.stat.config.ApplicationStatSerializeConfiguration;
 import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.config.SpanSerializeConfiguration;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -22,10 +20,5 @@
         "com.navercorp.pinpoint.common.server.dao.hbase.mapper",
 })
 public class CommonsHbaseConfiguration {
-    @Bean
-    public AgentStatDataPointCodec agentStatDataPointCodec() {
-        return new AgentStatDataPointCodec();
-    }
-
 
 }
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/PinpointWebModule.java b/web/src/main/java/com/navercorp/pinpoint/web/PinpointWebModule.java
index 3cbfee31dab2..f9f14f4fe4a6 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/PinpointWebModule.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/PinpointWebModule.java
@@ -52,7 +52,10 @@
         "com.navercorp.pinpoint.web.mapper",
         "com.navercorp.pinpoint.web.filter",
         "com.navercorp.pinpoint.web.view",
-        "com.navercorp.pinpoint.web.applicationmap"
+        "com.navercorp.pinpoint.web.applicationmap",
+
+        "com.navercorp.pinpoint.web.controller",
+        "com.navercorp.pinpoint.web.util"
 })
 public class PinpointWebModule {
     @Bean
diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml
index a70574388103..491f5ec818c1 100644
--- a/web/src/main/resources/application.yml
+++ b/web/src/main/resources/application.yml
@@ -1,9 +1,10 @@
 spring:
   main:
-    allow-bean-definition-overriding: true
+    allow-bean-definition-overriding: false
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
+      use-suffix-pattern: true
   profiles:
     active: release
 
diff --git a/web/src/main/resources/applicationContext-web.xml b/web/src/main/resources/applicationContext-web.xml
index 08fe15a8280d..d159e8339b4a 100644
--- a/web/src/main/resources/applicationContext-web.xml
+++ b/web/src/main/resources/applicationContext-web.xml
@@ -38,9 +38,6 @@
         </constructor-arg>
     </bean>
 
-    <bean id="agentEventMessageDeserializerV1" class="com.navercorp.pinpoint.common.server.util.AgentEventMessageDeserializerV1"/>
-
-
     <bean id="annotationKeyRegistryService" class="com.navercorp.pinpoint.loader.service.DefaultAnnotationKeyRegistryService">
         <constructor-arg ref="typeLoaderService"/>
     </bean>
@@ -48,9 +45,6 @@
     <bean id="apiParserProvider" class="com.navercorp.pinpoint.common.server.trace.ApiParserProvider">
     </bean>
 
-    <bean id="spanServiceImpl" class="com.navercorp.pinpoint.web.service.SpanServiceImpl">
-    </bean>
-
     <bean id="hbaseSqlMetaDataDao" class="com.navercorp.pinpoint.web.dao.hbase.HbaseSqlMetaDataDao">
     </bean>
 
diff --git a/web/src/main/resources/servlet-context-web.xml b/web/src/main/resources/servlet-context-web.xml
index 6cf0b57a24bf..fc668a619db3 100644
--- a/web/src/main/resources/servlet-context-web.xml
+++ b/web/src/main/resources/servlet-context-web.xml
@@ -1,32 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
         http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-    <mvc:annotation-driven>
-        <!--
-        Turn off useSuffixPatternMatching by default
-        https://github.com/spring-projects/spring-framework/issues/23915
-        -->
-        <mvc:path-matching suffix-pattern="true"/>
-    </mvc:annotation-driven>
-
-    <tx:annotation-driven/>
-
-    <context:component-scan base-package="com.navercorp.pinpoint.web.controller, com.navercorp.pinpoint.web.util"/>
-
-    <bean id="jsonView" class="org.springframework.web.servlet.view.json.MappingJackson2JsonView"/>
-
-    <bean id="viewResolver" class="org.springframework.web.servlet.view.BeanNameViewResolver"/>
-
-    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver"/>
-
     <mvc:interceptors>
         <bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
             <property name="cacheSeconds" value="0"/>