diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt
index e20f3a8..ecd9da9 100644
--- a/server/gameserver/CMakeLists.txt
+++ b/server/gameserver/CMakeLists.txt
@@ -10,10 +10,8 @@ endif()
 
 set(CMAKE_BUILD_TYPE "Debug")
 set(CMAKE_BUILD_TYPE "Release")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -DRAY_DETECTION=1")
-#set(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -fsanitize=address -fno-omit-frame-pointer")
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -DRAY_DETECTION=1")
-#set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -fsanitize=address -fno-omit-frame-pointer")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1")
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1")
 
 include_directories(
   AFTER
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 2e1d29f..42c795b 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -108,18 +108,14 @@ void Player::UpdateMove()
         moving = false;
         moved_frames = 0;
         last_collision_door = nullptr;
-#ifdef RAY_DETECTION
         movement->Clear();
-#endif
         return;
     }
     ++moved_frames;
     if (moved_frames > 4) {
         moving = false;
         moved_frames = 0;
-#ifdef RAY_DETECTION
         movement->Clear();
-#endif
         return;
     }
     if (in_walk_zone) {
@@ -696,13 +692,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
             move_dir.FromPB(&msg.move_dir());
             move_dir.Normalize();
             moving = true;
-#ifdef RAY_DETECTION
             if (std::abs(move_dir.x - old_move_dir.x) > 0.000001f ||
                 std::abs(move_dir.y - old_move_dir.y) > 0.000001f) {
                 ClearWalkZone();
                 movement->RayDetection();
             }
-#endif
         }
     }
     assert(!isnan(move_dir.x) && !isnan(move_dir.y));
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 62b5693..6ee4e32 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -606,9 +606,7 @@ void Room::CreateBullet(Human* hum, Weapon* weapon,
     bullet->Initialize();
     AddObjectLater(bullet);
     grid_service.AddBullet(bullet);
-#ifdef RAY_DETECTION
     bullet->movement->RayDetection();
-#endif
 }
 
 void Room::RemoveObjectLater(Entity* entity)