diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
index 15099571..84899e56 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
@@ -8,6 +8,7 @@ import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
 import icu.samnyan.aqua.sega.chusan.model.request.UserCMissionResp
 import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingMemberInfo
 import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingWaitState
+import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney
 import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.general.RequestContext
@@ -37,7 +38,6 @@ class ChusanServletController(
     val getUserRecentRating: GetUserRecentRatingHandler,
     val upsertUserAll: UpsertUserAllHandler,
     val cmGetUserPreview: CMGetUserPreviewHandler,
-    val cmGetUserData: CMGetUserDataHandler,
     val cmGetUserCharacter: CMGetUserCharacterHandler,
     val cmGetUserItem: CMGetUserItemHandler,
     val cmUpsertUserGacha: CMUpsertUserGachaHandler,
@@ -388,4 +388,11 @@ fun ChusanServletController.init() {
             )
         )
     }
+
+    // CardMaker (TODO: Somebody test this, I don't have a card maker)
+    "CMGetUserData" {
+        val user = db.userData.findByCard_ExtId(uid)() ?: (400 - "User not found")
+        user.userEmoney = UserEmoney()
+        mapOf("userId" to uid, "userData" to user, "userEmoney" to user.userEmoney)
+    }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserDataHandler.java
deleted file mode 100644
index e590d0ab..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserDataHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.handler;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import icu.samnyan.aqua.sega.general.BaseHandler;
-import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney;
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData;
-import icu.samnyan.aqua.sega.chusan.service.UserDataService;
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Component("ChusanCMGetUserDataHandler")
-public class CMGetUserDataHandler implements BaseHandler {
-
-    private static final Logger logger = LoggerFactory.getLogger(CMGetUserDataHandler.class);
-
-    private final BasicMapper mapper;
-
-    private final UserDataService userDataService;
-
-    @Autowired
-    public CMGetUserDataHandler(BasicMapper mapper, UserDataService userDataService) {
-        this.mapper = mapper;
-        this.userDataService = userDataService;
-    }
-
-    @Override
-    public String handle(Map<String, ?> request) throws JsonProcessingException {
-        String userId = String.valueOf(request.get("userId"));
-        Optional<Chu3UserData> userDataOptional = userDataService.getUserByExtId(userId);
-
-        if (userDataOptional.isPresent()) {
-            Map<String, Object> resultMap = new LinkedHashMap<>();
-            resultMap.put("userId", userId);
-            Chu3UserData user = userDataOptional.get();
-            UserEmoney userEmoney = new UserEmoney();
-            user.setUserEmoney(userEmoney);
-
-            resultMap.put("userData", user);
-            resultMap.put("userEmoney", userEmoney);
-
-            String json = mapper.write(resultMap);
-
-            logger.info("Response: " + json);
-            return json;
-        }
-
-        return null;
-    }
-}