diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index 448ba89aa..b28d3d706 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -719,9 +719,7 @@ void GCodeProcessor::UsedFilaments::process_caches(GCodeProcessor* processor)
 void GCodeProcessorResult::reset() {
     moves = std::vector<GCodeProcessorResult::MoveVertex>();
     bed_shape = Pointfs();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     max_print_height = 0.0f;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     settings_ids.reset();
     extruders_count = 0;
     extruder_colors = std::vector<std::string>();
@@ -736,9 +734,7 @@ void GCodeProcessorResult::reset() {
     moves.clear();
     lines_ends.clear();
     bed_shape = Pointfs();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     max_print_height = 0.0f;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     settings_ids.reset();
     extruders_count = 0;
     extruder_colors = std::vector<std::string>();
@@ -889,9 +885,7 @@ void GCodeProcessor::apply_config(const PrintConfig& config)
     if (first_layer_height != nullptr)
         m_first_layer_height = std::abs(first_layer_height->value);
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     m_result.max_print_height = config.max_print_height;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 }
 
 void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
@@ -1122,11 +1116,9 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
     if (first_layer_height != nullptr)
         m_first_layer_height = std::abs(first_layer_height->value);
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     const ConfigOptionFloat* max_print_height = config.option<ConfigOptionFloat>("max_print_height");
     if (max_print_height != nullptr)
         m_result.max_print_height = max_print_height->value;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 }
 
 void GCodeProcessor::enable_stealth_time_estimator(bool enabled)
diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp
index 330d8f71e..a7c1144f0 100644
--- a/src/libslic3r/GCode/GCodeProcessor.hpp
+++ b/src/libslic3r/GCode/GCodeProcessor.hpp
@@ -117,9 +117,7 @@ namespace Slic3r {
         // Positions of ends of lines of the final G-code this->filename after TimeProcessor::post_process() finalizes the G-code.
         std::vector<size_t> lines_ends;
         Pointfs bed_shape;
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         float max_print_height;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         SettingsIds settings_ids;
         size_t extruders_count;
         std::vector<std::string> extruder_colors;
diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp
index 4466d0dcc..ecb29d4b8 100644
--- a/src/libslic3r/Geometry.cpp
+++ b/src/libslic3r/Geometry.cpp
@@ -33,14 +33,12 @@ bool directions_parallel(double angle1, double angle2, double max_diff)
     return diff < max_diff || fabs(diff - PI) < max_diff;
 }
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 bool directions_perpendicular(double angle1, double angle2, double max_diff)
 {
     double diff = fabs(angle1 - angle2);
     max_diff += EPSILON;
     return fabs(diff - 0.5 * PI) < max_diff || fabs(diff - 1.5 * PI) < max_diff;
 }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
 template<class T>
 bool contains(const std::vector<T> &vector, const Point &point)
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index 769f1d6df..e84a7aace 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -288,9 +288,7 @@ bool liang_barsky_line_clipping(
 }
 
 bool directions_parallel(double angle1, double angle2, double max_diff = 0);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 bool directions_perpendicular(double angle1, double angle2, double max_diff = 0);
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 template<class T> bool contains(const std::vector<T> &vector, const Point &point);
 template<typename T> T rad2deg(T angle) { return T(180.0) * angle / T(PI); }
 double rad2deg_dir(double angle);
diff --git a/src/libslic3r/Line.cpp b/src/libslic3r/Line.cpp
index 773df3442..3a180f747 100644
--- a/src/libslic3r/Line.cpp
+++ b/src/libslic3r/Line.cpp
@@ -70,7 +70,6 @@ bool Line::parallel_to(const Line& line) const
     return sqr(cross2(v1, v2)) < sqr(EPSILON) * v1.squaredNorm() * v2.squaredNorm();
 }
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 bool Line::perpendicular_to(double angle) const
 {
     return Slic3r::Geometry::directions_perpendicular(this->direction(), angle);
@@ -82,7 +81,6 @@ bool Line::perpendicular_to(const Line& line) const
     const Vec2d v2 = (line.b - line.a).cast<double>();
     return sqr(v1.dot(v2)) < sqr(EPSILON) * v1.squaredNorm() * v2.squaredNorm();
 }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
 bool Line::intersection(const Line &l2, Point *intersection) const
 {
diff --git a/src/libslic3r/Line.hpp b/src/libslic3r/Line.hpp
index a4dcd827c..751e59458 100644
--- a/src/libslic3r/Line.hpp
+++ b/src/libslic3r/Line.hpp
@@ -105,10 +105,8 @@ public:
     double perp_distance_to(const Point &point) const;
     bool   parallel_to(double angle) const;
     bool   parallel_to(const Line& line) const;
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     bool   perpendicular_to(double angle) const;
     bool   perpendicular_to(const Line& line) const;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     double atan2_() const { return atan2(this->b(1) - this->a(1), this->b(0) - this->a(0)); }
     double orientation() const;
     double direction() const;
diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index 4f5098d59..39f1fa4c7 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -80,9 +80,6 @@
 
 // Enable rendering modifiers and similar objects always as transparent
 #define ENABLE_MODIFIERS_ALWAYS_TRANSPARENT (1 && ENABLE_2_4_0_BETA1)
-// Enable the fix for the detection of the out of bed state for sinking objects
-// and detection of out of bed using the bed perimeter
-#define ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS (1 && ENABLE_2_4_0_BETA1)
 
 
 //====================
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index 365de8fb4..5eafd6884 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -436,7 +436,6 @@ BoundingBoxf3 TriangleMesh::transformed_bounding_box(const Transform3d &trafo) c
     return bbox;
 }
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 BoundingBoxf3 TriangleMesh::transformed_bounding_box(const Transform3d& trafod, double world_min_z) const
 {
     // 1) Allocate transformed vertices with their position with respect to print bed surface.
@@ -487,7 +486,6 @@ BoundingBoxf3 TriangleMesh::transformed_bounding_box(const Transform3d& trafod,
     };
     return out;
 }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
 TriangleMesh TriangleMesh::convex_hull_3d() const
 {
diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index 459917ab9..3a0b2c2ce 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -125,10 +125,8 @@ public:
     BoundingBoxf3 bounding_box() const;
     // Returns the bbox of this TriangleMesh transformed by the given transformation
     BoundingBoxf3 transformed_bounding_box(const Transform3d &trafo) const;
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     // Variant returning the bbox of the part of this TriangleMesh above the given world_min_z
     BoundingBoxf3 transformed_bounding_box(const Transform3d& trafo, double world_min_z) const;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     // Return the size of the mesh in coordinates.
     Vec3d size() const { return m_stats.size.cast<double>(); }
     /// Return the center of the related bounding box.
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index f377edafa..ca634c079 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -262,11 +262,9 @@ void GLIndexedVertexArray::render(
     const std::pair<size_t, size_t>& tverts_range,
     const std::pair<size_t, size_t>& qverts_range) const
 {
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     // this method has been called before calling finalize() ?
     if (this->vertices_and_normals_interleaved_VBO_id == 0 && !this->vertices_and_normals_interleaved.empty())
         return;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     assert(this->vertices_and_normals_interleaved_VBO_id != 0);
     assert(this->triangle_indices_VBO_id != 0 || this->quad_indices_VBO_id != 0);
@@ -524,7 +522,6 @@ BoundingBoxf3 GLVolume::transformed_convex_hull_bounding_box(const Transform3d &
         bounding_box().transformed(trafo);
 }
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 BoundingBoxf3 GLVolume::transformed_non_sinking_bounding_box(const Transform3d& trafo) const
 {
     return GUI::wxGetApp().plater()->model().objects[object_idx()]->volumes[volume_idx()]->mesh().transformed_bounding_box(trafo, 0.0);
@@ -539,7 +536,6 @@ const BoundingBoxf3& GLVolume::transformed_non_sinking_bounding_box() const
     }
     return *m_transformed_non_sinking_bounding_box;
 }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
 void GLVolume::set_range(double min_z, double max_z)
 {
@@ -773,9 +769,7 @@ int GLVolumeCollection::load_wipe_tower_preview(
     volumes.emplace_back(new GLVolume(color));
     GLVolume& v = *volumes.back();
     v.indexed_vertex_array.load_mesh(mesh);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     v.set_convex_hull(mesh.convex_hull_3d());
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     v.indexed_vertex_array.finalize_geometry(opengl_initialized);
     v.set_volume_offset(Vec3d(pos_x, pos_y, 0.0));
     v.set_volume_rotation(Vec3d(0., 0., (M_PI / 180.) * rotation_angle));
@@ -882,17 +876,10 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
         shader->set_uniform("uniform_color", volume.first->render_color);
         shader->set_uniform("z_range", m_z_range, 2);
         shader->set_uniform("clipping_plane", m_clipping_plane, 4);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         shader->set_uniform("print_volume.type", static_cast<int>(m_print_volume.type));
         shader->set_uniform("print_volume.xy_data", m_print_volume.data);
         shader->set_uniform("print_volume.z_data", m_print_volume.zs);
         shader->set_uniform("volume_world_matrix", volume.first->world_matrix());
-#else
-        shader->set_uniform("print_box.min", m_print_box_min, 3);
-        shader->set_uniform("print_box.max", m_print_box_max, 3);
-        shader->set_uniform("print_box.actived", volume.first->shader_outside_printer_detection_enabled);
-        shader->set_uniform("print_box.volume_world_matrix", volume.first->world_matrix());
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         shader->set_uniform("slope.actived", m_slope.active && !volume.first->is_modifier && !volume.first->is_wipe_tower);
         shader->set_uniform("slope.volume_world_normal_matrix", static_cast<Matrix3f>(volume.first->world_matrix().matrix().block(0, 0, 3, 3).inverse().transpose().cast<float>()));
         shader->set_uniform("slope.normal_z", m_slope.normal_z);
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index a38a0e0ed..8eb481f7b 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -681,9 +681,7 @@ void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& pr
     if (wxGetApp().is_gcode_viewer())
         m_custom_gcode_per_print_z = gcode_result.custom_gcode_per_print_z;
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     m_max_print_height = gcode_result.max_print_height;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     load_toolpaths(gcode_result);
 
@@ -831,9 +829,7 @@ void GCodeViewer::reset()
 
     m_paths_bounding_box = BoundingBoxf3();
     m_max_bounding_box = BoundingBoxf3();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     m_max_print_height = 0.0f;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     m_tool_colors = std::vector<Color>();
     m_extruders_count = 0;
     m_extruder_ids = std::vector<unsigned char>();
@@ -850,9 +846,7 @@ void GCodeViewer::reset()
 #if ENABLE_GCODE_VIEWER_STATISTICS
     m_statistics.reset_all();
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     m_contained_in_bed = true;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 }
 
 void GCodeViewer::render()
diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp
index 85151ceb8..f81cb823e 100644
--- a/src/slic3r/GUI/GCodeViewer.hpp
+++ b/src/slic3r/GUI/GCodeViewer.hpp
@@ -780,9 +780,7 @@ private:
     BoundingBoxf3 m_paths_bounding_box;
     // bounding box of toolpaths + marker tools
     BoundingBoxf3 m_max_bounding_box;
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     float m_max_print_height{ 0.0f };
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     std::vector<Color> m_tool_colors;
     Layers m_layers;
     std::array<unsigned int, 2> m_layers_z_range;
@@ -807,9 +805,7 @@ private:
 
     std::vector<CustomGCode::Item> m_custom_gcode_per_print_z;
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     bool m_contained_in_bed{ true };
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
 public:
     GCodeViewer();
@@ -839,9 +835,7 @@ public:
     const SequentialView& get_sequential_view() const { return m_sequential_view; }
     void update_sequential_view_current(unsigned int first, unsigned int last);
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     bool is_contained_in_bed() const { return m_contained_in_bed; }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     EViewType get_view_type() const { return m_view_type; }
     void set_view_type(EViewType type) {
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 452173ae2..e52aec187 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -2585,9 +2585,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
                 displacement = multiplier * direction;
 
             m_selection.translate(displacement);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
             m_selection.stop_dragging();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
             m_dirty = true;
         }
     );
@@ -2686,9 +2684,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
                     auto do_rotate = [this](double angle_z_rad) {
                         m_selection.start_dragging();
                         m_selection.rotate(Vec3d(0.0, 0.0, angle_z_rad), TransformationType(TransformationType::World_Relative_Joint));
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
                         m_selection.stop_dragging();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
                         m_dirty = true;
 //                        wxGetApp().obj_manipul()->set_dirty();
                     };
@@ -3242,10 +3238,8 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         }
     }
     else if (evt.LeftUp() || evt.MiddleUp() || evt.RightUp()) {
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         if (evt.LeftUp())
             m_selection.stop_dragging();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
         if (m_layers_editing.state != LayersEditing::Unknown) {
             m_layers_editing.state = LayersEditing::Unknown;
@@ -6342,15 +6336,8 @@ void GLCanvas3D::_set_warning_notification_if_needed(EWarning warning)
         show = _is_any_volume_outside();
     else {
         if (wxGetApp().is_editor()) {
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
             if (current_printer_technology() != ptSLA)
                 show = m_gcode_viewer.has_data() && !m_gcode_viewer.is_contained_in_bed();
-#else
-            BoundingBoxf3 test_volume = (m_config != nullptr) ? print_volume(*m_config) : BoundingBoxf3();
-            const BoundingBoxf3& paths_volume = m_gcode_viewer.get_paths_bounding_box();
-            if (test_volume.radius() > 0.0 && paths_volume.radius() > 0.0)
-                show = !test_volume.contains(paths_volume);
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         }
     }
 
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index ffcc4a6a0..4591da29f 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -479,9 +479,7 @@ private:
     const DynamicPrintConfig* m_config;
     Model* m_model;
     BackgroundSlicingProcess *m_process;
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     bool m_requires_check_outside_state{ false };
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     std::array<unsigned int, 2> m_old_size{ 0, 0 };
 
@@ -618,9 +616,7 @@ public:
     void post_event(wxEvent &&event);
 
     void set_as_dirty();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     void requires_check_outside_state() { m_requires_check_outside_state = true; }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     unsigned int get_volumes_count() const;
     const GLVolumeCollection& get_volumes() const { return m_volumes; }
diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp
index 01407b09a..b67ee9b5d 100644
--- a/src/slic3r/GUI/GLShadersManager.cpp
+++ b/src/slic3r/GUI/GLShadersManager.cpp
@@ -61,12 +61,8 @@ std::pair<bool, std::string> GLShadersManager::init()
     // used to render extrusion and travel paths as lines in gcode preview
     valid &= append_shader("toolpaths_lines", { "toolpaths_lines.vs", "toolpaths_lines.fs" });
     // used to render objects in 3d editor
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     // When setting this technology to default rename the following from "gouraud_mod" to "gouraud"
     valid &= append_shader("gouraud_mod", { "gouraud_mod.vs", "gouraud_mod.fs" }
-#else
-    valid &= append_shader("gouraud", { "gouraud.vs", "gouraud.fs" }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 #if ENABLE_ENVIRONMENT_MAP
         , { "ENABLE_ENVIRONMENT_MAP"sv }
 #endif // ENABLE_ENVIRONMENT_MAP
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index f5a274d69..201e5d78d 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -657,14 +657,10 @@ void ObjectManipulation::update_if_dirty()
     else
         m_og->disable();
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     if (!selection.is_dragging()) {
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
-    update_reset_buttons_visibility();
-    update_mirror_buttons_visibility();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
+        update_reset_buttons_visibility();
+      update_mirror_buttons_visibility();
     }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     m_dirty = false;
 }
@@ -820,9 +816,7 @@ void ObjectManipulation::change_position_value(int axis, double value)
     Selection& selection = canvas->get_selection();
     selection.start_dragging();
     selection.translate(position - m_cache.position, selection.requires_local_axes());
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     selection.stop_dragging();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     canvas->do_move(L("Set Position"));
 
     m_cache.position = position;
@@ -854,9 +848,7 @@ void ObjectManipulation::change_rotation_value(int axis, double value)
 	selection.rotate(
 		(M_PI / 180.0) * (transformation_type.absolute() ? rotation : rotation - m_cache.rotation), 
 		transformation_type);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     selection.stop_dragging();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     canvas->do_rotate(L("Set Orientation"));
 
     m_cache.rotation = rotation;
@@ -935,9 +927,7 @@ void ObjectManipulation::do_scale(int axis, const Vec3d &scale) const
 
     selection.start_dragging();
     selection.scale(scaling_factor, transformation_type);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     selection.stop_dragging();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     wxGetApp().plater()->canvas3D()->do_scale(L("Set Scale"));
 }
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
index 5ee0fddb1..b679bddb4 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
@@ -66,20 +66,12 @@ GLGizmoPainterBase::ClippingPlaneDataWrapper GLGizmoPainterBase::get_clipping_pl
 
 void GLGizmoPainterBase::render_triangles(const Selection& selection) const
 {
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     auto* shader = wxGetApp().get_shader("gouraud_mod");
-#else
-    auto* shader = wxGetApp().get_shader("gouraud");
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     if (! shader)
         return;
     shader->start_using();
     shader->set_uniform("slope.actived", false);
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     shader->set_uniform("print_volume.type", 0);
-#else
-    shader->set_uniform("print_box.actived", false);
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     shader->set_uniform("clipping_plane", this->get_clipping_plane_data().clp_dataf);
     ScopeGuard guard([shader]() { if (shader) shader->stop_using(); });
 
@@ -106,11 +98,7 @@ void GLGizmoPainterBase::render_triangles(const Selection& selection) const
         // to the shader input variable print_box.volume_world_matrix before
         // rendering the painted triangles. When this matrix is not set, the
         // wrong transformation matrix is used for "Clipping of view".
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         shader->set_uniform("volume_world_matrix", trafo_matrix);
-#else
-        shader->set_uniform("print_box.volume_world_matrix", trafo_matrix);
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
         m_triangle_selectors[mesh_id]->render(m_imgui);
 
@@ -609,11 +597,7 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui)
     auto* shader = wxGetApp().get_current_shader();
     if (! shader)
         return;
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     assert(shader->get_name() == "gouraud_mod");
-#else
-    assert(shader->get_name() == "gouraud");
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     ScopeGuard guard([shader]() { if (shader) shader->set_uniform("offset_depth_buffer", false);});
     shader->set_uniform("offset_depth_buffer", true);
     for (auto iva : {std::make_pair(&m_iva_enforcers, enforcers_color),
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index 3104a8595..7eea8315f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -715,22 +715,18 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt)
         }
         else if (evt.LeftUp() && m_current == Flatten && m_gizmos[m_current]->get_hover_id() != -1) {
             // to avoid to loose the selection when user clicks an the white faces of a different object while the Flatten gizmo is active
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
             selection.stop_dragging();
             wxGetApp().obj_manipul()->set_dirty();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
             processed = true;
         }
         else if (evt.RightUp() && (m_current == FdmSupports || m_current == Seam || m_current == MmuSegmentation) && !m_parent.is_mouse_dragging()) {
             gizmo_event(SLAGizmoEventType::RightUp, mouse_pos, evt.ShiftDown(), evt.AltDown(), control_down);
             processed = true;
         }
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
         else if (evt.LeftUp()) {
             selection.stop_dragging();
             wxGetApp().obj_manipul()->set_dirty();
         }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     }
     else {
         // mouse inside toolbar
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
index a6bcc0b38..c3313d434 100644
--- a/src/slic3r/GUI/Selection.cpp
+++ b/src/slic3r/GUI/Selection.cpp
@@ -112,9 +112,7 @@ Selection::Selection()
     , m_type(Empty)
     , m_valid(false)
     , m_scale_factor(1.0f)
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     , m_dragging(false)
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 {
     this->set_bounding_boxes_dirty();
 }
@@ -693,10 +691,7 @@ void Selection::start_dragging()
     if (!m_valid)
         return;
 
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     m_dragging = true;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
-
     set_caches();
 }
 
@@ -737,9 +732,7 @@ void Selection::translate(const Vec3d& displacement, bool local)
 
     ensure_not_below_bed();
     set_bounding_boxes_dirty();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     wxGetApp().plater()->canvas3D()->requires_check_outside_state();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 }
 
 // Rotate an object around one of the axes. Only one rotation component is expected to be changing.
@@ -853,9 +846,7 @@ void Selection::rotate(const Vec3d& rotation, TransformationType transformation_
     }
 
     set_bounding_boxes_dirty();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     wxGetApp().plater()->canvas3D()->requires_check_outside_state();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 }
 
 void Selection::flattening_rotate(const Vec3d& normal)
@@ -954,9 +945,7 @@ void Selection::scale(const Vec3d& scale, TransformationType transformation_type
 
     ensure_on_bed();
     set_bounding_boxes_dirty();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     wxGetApp().plater()->canvas3D()->requires_check_outside_state();
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 }
 
 void Selection::scale_to_fit_print_volume(const DynamicPrintConfig& config)
diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp
index cb8f38d50..c81fa0510 100644
--- a/src/slic3r/GUI/Selection.hpp
+++ b/src/slic3r/GUI/Selection.hpp
@@ -219,10 +219,7 @@ private:
     GLModel m_curved_arrow;
 
     float m_scale_factor;
-
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     bool m_dragging;
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
 public:
     Selection();
@@ -316,10 +313,8 @@ public:
     const BoundingBoxf3& get_scaled_instance_bounding_box() const;
 
     void start_dragging();
-#if ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
     void stop_dragging() { m_dragging = false; }
     bool is_dragging() const { return m_dragging; }
-#endif // ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS
 
     void translate(const Vec3d& displacement, bool local = false);
     void rotate(const Vec3d& rotation, TransformationType transformation_type);