3 files changed, 6 insertions, 13 deletions
diff --git a/core/math/bvh_cull.inc b/core/math/bvh_cull.inc
index d7edc8a884..ab468bfd29 100644
--- a/core/math/bvh_cull.inc
+++ b/core/math/bvh_cull.inc
@@ -508,8 +508,9 @@ bool _cull_convex_iterative(uint32_t p_node_id, CullParams &r_params, bool p_ful
 						uint32_t child_id = leaf.get_item_ref_id(n);
 
 						// full up with results? exit early, no point in further testing
-						if (!_cull_hit(child_id, r_params))
+						if (!_cull_hit(child_id, r_params)) {
 							return false;
+						}
 					}
 				}
 #endif // BVH_CONVEX_CULL_OPTIMIZED
diff --git a/core/math/bvh_debug.inc b/core/math/bvh_debug.inc
index 55db794ee3..896c36ecf1 100644
--- a/core/math/bvh_debug.inc
+++ b/core/math/bvh_debug.inc
@@ -1,8 +1,9 @@
 public:
 #ifdef BVH_VERBOSE
 void _debug_recursive_print_tree(int p_tree_id) const {
-	if (_root_node_id[p_tree_id] != BVHCommon::INVALID)
+	if (_root_node_id[p_tree_id] != BVHCommon::INVALID) {
 		_debug_recursive_print_tree_node(_root_node_id[p_tree_id]);
+	}
 }
 
 String _debug_aabb_to_string(const BVHABB_CLASS &aabb) const {
@@ -42,8 +43,9 @@ void _debug_recursive_print_tree_node(uint32_t p_node_id, int depth = 0) const {
 
 		sz += "[";
 		for (int n = 0; n < leaf.num_items; n++) {
-			if (n)
+			if (n) {
 				sz += ", ";
+			}
 			sz += "r";
 			sz += itos(leaf.get_item_ref_id(n));
 		}
diff --git a/core/math/octree.h b/core/math/octree.h
index 23ba4c1aa3..e73f8213b3 100644
--- a/core/math/octree.h
+++ b/core/math/octree.h
@@ -211,11 +211,6 @@ private:
 			E = pair_map.insert(key, pdata);
 			E->get().eA = p_A->pair_list.push_back(&E->get());
 			E->get().eB = p_B->pair_list.push_back(&E->get());
-
-			/*
-			if (pair_callback)
-				pair_callback(pair_callback_userdata,p_A->userdata,p_B->userdata);
-			*/
 		} else {
 			E->get().refcount++;
 		}
@@ -854,11 +849,6 @@ void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const AABB &p_aabb) {
 		Octant *o = F->get().octant;
 		typename List<typename Element::OctantOwner, AL>::Element *N = F->next();
 
-		/*
-		if (!use_pairs)
-			o->elements.erase( F->get().E );
-		*/
-
 		if (use_pairs && e.pairable) {
 			o->pairable_elements.erase(F->get().E);
 		} else {