diff --git a/packages/mermaid/src/diagrams/block/blockDB.ts b/packages/mermaid/src/diagrams/block/blockDB.ts
index 2902af417..e63c4fce6 100644
--- a/packages/mermaid/src/diagrams/block/blockDB.ts
+++ b/packages/mermaid/src/diagrams/block/blockDB.ts
@@ -83,7 +83,7 @@ export const setCssClass = function (itemIds: string, cssClassName: string) {
   });
 };
 
-const populateBlockDatabase = (_blockList: (Block[] | Block[][]), parent: Block): void => {
+const populateBlockDatabase = (_blockList: Block[] | Block[][], parent: Block): void => {
   const blockList = _blockList.flat();
   const children = [];
   for (const block of blockList) {
@@ -265,13 +265,14 @@ const getColumns = (blockid: string): number => {
  * @returns
  */
 const getBlocksFlat = () => {
-  const result: Block[] = [];
-  // log.debug('abc88 getBlocksFlat', blockDatabase);
-  const keys = Object.keys(blockDatabase);
-  for (const key of keys) {
-    result.push(blockDatabase[key]);
-  }
-  return result;
+  // const result: Block[] = [];
+  // // log.debug('abc88 getBlocksFlat', blockDatabase);
+  // const keys = Object.keys(blockDatabase);
+  // for (const key of keys) {
+  //   result.push(blockDatabase[key]);
+  // }
+  // return result;
+  return [...Object.values(blockDatabase)];
 };
 /**
  * Returns the the hierarchy of blocks
@@ -280,6 +281,7 @@ const getBlocksFlat = () => {
 const getBlocks = () => {
   return blocks || [];
 };
+
 const getEdges = () => {
   return edgeList;
 };
diff --git a/packages/mermaid/src/diagrams/block/blockDiagram.ts b/packages/mermaid/src/diagrams/block/blockDiagram.ts
index 9cefd0425..7a4c63eba 100644
--- a/packages/mermaid/src/diagrams/block/blockDiagram.ts
+++ b/packages/mermaid/src/diagrams/block/blockDiagram.ts
@@ -5,12 +5,6 @@ import db from './blockDB.js';
 import flowStyles from './styles.js';
 import renderer from './blockRenderer.js';
 
-// TODO: do we need this?
-// import { prepareTextForParsing } from './blockUtils.js';
-// const originalParse = parser.parse.bind(parser);
-// parser.parse = (text: string) => originalParse(prepareTextForParsing(text));
-// parser.yy.getLogger = () => console;
-
 export const diagram: DiagramDefinition = {
   parser,
   db,
diff --git a/packages/mermaid/src/diagrams/block/blockRenderer.ts b/packages/mermaid/src/diagrams/block/blockRenderer.ts
index 31790de6e..cadae89f2 100644
--- a/packages/mermaid/src/diagrams/block/blockRenderer.ts
+++ b/packages/mermaid/src/diagrams/block/blockRenderer.ts
@@ -25,12 +25,7 @@ import { configureSvgSize } from '../../setupGraphViewbox.js';
  * @returns ClassDef - The styles
  */
 export const getClasses = function (text: any, diagObj: any) {
-  log.debug('Extracting classes', diagObj.db.getClasses());
-  try {
-    return diagObj.db.getClasses();
-  } catch (e) {
-    return;
-  }
+  return diagObj.db.getClasses();
 };
 
 export const draw = async function (