diff --git a/gameserver/src/net/handlers/player.rs b/gameserver/src/net/handlers/player.rs
index dd0c0a4..eb17571 100644
--- a/gameserver/src/net/handlers/player.rs
+++ b/gameserver/src/net/handlers/player.rs
@@ -1,9 +1,6 @@
 use std::collections::HashMap;
 
-use crate::{
-    net::tools::JsonData,
-    util::{self, cur_timestamp_ms},
-};
+use crate::util::{self};
 
 use super::*;
 
@@ -23,28 +20,6 @@ pub async fn on_get_basic_info_cs_req(
         .await
 }
 
-// pub async fn on_get_hero_basic_type_info_cs_req(
-//     session: &mut PlayerSession,
-//     _body: &GetHeroBasicTypeInfoCsReq,
-// ) -> Result<()> {
-//     let mc = JsonData::load().await.main_character;
-//     session
-//         .send(
-//             CMD_GET_HERO_BASIC_TYPE_INFO_SC_RSP,
-//             GetHeroBasicTypeInfoScRsp {
-//                 retcode: 0,
-//                 gender: mc.get_gender().into(),
-//                 cur_basic_type: mc.get_type().into(),
-//                 basic_type_info_list: vec![HeroBasicTypeInfo {
-//                     basic_type: mc.get_type().into(),
-//                     ..Default::default()
-//                 }],
-//                 ..Default::default()
-//             },
-//         )
-//         .await
-// }
-
 pub async fn on_player_heart_beat_cs_req(
     session: &mut PlayerSession,
     body: &PlayerHeartBeatCsReq,
diff --git a/gameserver/src/net/handlers/scene.rs b/gameserver/src/net/handlers/scene.rs
index 19db710..eddb5c3 100644
--- a/gameserver/src/net/handlers/scene.rs
+++ b/gameserver/src/net/handlers/scene.rs
@@ -8,7 +8,7 @@ use crate::{
         tools::{AvatarJson, JsonData, Position},
         tools_res::{PropState, GAME_RESOURCES},
     },
-    util::{self, cur_timestamp_ms},
+    util::{self},
 };
 
 use super::*;
@@ -337,7 +337,6 @@ async fn load_scene(
                     ..Default::default()
                 })),
                 entity_id: prop_entity_id,
-                ..Default::default()
             };
 
             group_info.entity_list.push(entity_info);
@@ -367,7 +366,6 @@ async fn load_scene(
                     npc_id: npc.npcid,
                     ..Default::default()
                 })),
-                ..Default::default()
             };
 
             group_info.entity_list.push(info);
@@ -396,7 +394,6 @@ async fn load_scene(
                 entity_id: monster_entity_id,
                 motion: Some(monster_position.to_motion()),
                 entity: Some(Entity::NpcMonster(npc_monster)),
-                ..Default::default()
             };
 
             group_info.entity_list.push(info);
diff --git a/gameserver/src/net/packet.rs b/gameserver/src/net/packet.rs
index d3dbd27..60791ac 100644
--- a/gameserver/src/net/packet.rs
+++ b/gameserver/src/net/packet.rs
@@ -125,7 +125,7 @@ trait_handler! {
     TakeOffRelicCsReq 362;
 
     // // Chat (dummy!)
-    // SendMsgCsReq 3918;
+    SendMsgCsReq 3918;
     GetPrivateChatHistoryCsReq 3958;
     GetFriendListInfoCsReq 2918;
 
@@ -146,9 +146,9 @@ trait_handler! {
     EnterSceneCsReq 1425;
 
     // // Optional
-    // GetMailCsReq 861;
-    // GetGachaInfoCsReq 1961;
-    // DoGachaCsReq 1991;
+    GetMailCsReq 861;
+    GetGachaInfoCsReq 1961;
+    DoGachaCsReq 1991;
     // GetQuestDataCsReq 961;
     PlayerLoginFinishCsReq 76;
 }