diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index ca33091..9fc6f74 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -244,4 +244,5 @@ void Obstacle::Explosion()
        self_collider_->rad = old_rad;
    }
    explosioned = true;
+   room->RemoveObjectLater(this);
 }
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 1150089..6a48ed4 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -33,13 +33,6 @@ void Player::Initialize()
     health = meta->i->health();
     max_energy_shield = energy_shield;
     skin_meta = MetaMgr::Instance()->GetTank(SkinId());
-    #if 0
-    if (skin_meta) {
-        skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());
-    } else {
-        skill_meta = nullptr;
-    }
-    #endif
     RecalcBuff();
 }
 
@@ -664,7 +657,6 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google:
 
 void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
 {
-    bool has_move_dir = msg.has_move_dir();
     moving = false;
     if (msg.has_move_dir()) {
         if (std::abs(msg.move_dir().x()) > FLT_EPSILON ||
@@ -747,8 +739,6 @@ void Player::UpdateDropWeapon()
         Weapon* weapon = &weapons[drop_weapon_idx];
         int weapon_id = weapon->weapon_id;
         int weapon_lv = weapon->weapon_lv;
-        int weapon_ammo = weapon->ammo;
-        MetaData::Equip* weapon_meta = weapon->meta;
         if (weapon->weapon_id != 0) {
             if (weapon->weapon_idx == 0) {
                 if (weapon->weapon_id != default_weapon.weapon_id) {
diff --git a/server/gameserver/player.h b/server/gameserver/player.h
index 36051e8..8b30503 100644
--- a/server/gameserver/player.h
+++ b/server/gameserver/player.h
@@ -32,10 +32,10 @@ class Player : public Human
     int moved_frames = 0;
 
     bool select_weapon = false;
-    int selected_weapon_idx = 0;
+    size_t selected_weapon_idx = 0;
 
     bool drop_weapon = false;
-    int drop_weapon_idx = 0;
+    size_t drop_weapon_idx = 0;
 
     bool cancel_action = false;