diff --git a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
index bf1448acdc4..83091c2f87b 100644
--- a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -65,23 +65,7 @@ module CfgScope {
     }
   }
 
-  private class MethodScope extends Range_, Method {
-    final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) }
-
-    final override predicate exit(AstNode last, Completion c) {
-      this.(Trees::BodyStmtTree).lastInner(last, c)
-    }
-  }
-
-  private class SingletonMethodScope extends Range_, SingletonMethod {
-    final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) }
-
-    final override predicate exit(AstNode last, Completion c) {
-      this.(Trees::BodyStmtTree).lastInner(last, c)
-    }
-  }
-
-  private class DoBlockScope extends Range_, DoBlock {
+  private class BodyStmtCallableScope extends Range_, ASTInternal::TBodyStmt, Callable {
     final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) }
 
     final override predicate exit(AstNode last, Completion c) {
@@ -98,14 +82,6 @@ module CfgScope {
       last(this.(Trees::BraceBlockTree).getLastChildNode(), last, c)
     }
   }
-
-  private class LambdaScope extends Range_, Lambda {
-    final override predicate entry(AstNode first) { this.(Trees::BodyStmtTree).firstInner(first) }
-
-    final override predicate exit(AstNode last, Completion c) {
-      this.(Trees::BodyStmtTree).lastInner(last, c)
-    }
-  }
 }
 
 abstract private class ControlFlowTree extends AstNode {