diff --git a/util/docs/macros/index.mjs b/util/docs/macros/index.mjs
index 1e086152..e65d1c96 100644
--- a/util/docs/macros/index.mjs
+++ b/util/docs/macros/index.mjs
@@ -25,8 +25,6 @@ import { getPath, getExternalPath, getExternalSchemaPaths, getSchemaConstraints,
 import fs from 'fs'
 import pointfree from 'crocks/pointfree/index.js'
 const { filter, option, map } = pointfree
-import isArray from 'crocks/predicates/isArray.js'
-import safe from 'crocks/Maybe/safe.js'
 import { getProvidedCapabilities, isRPCOnlyMethod, isTemporalSetMethod, isProviderInterfaceMethod } from '../../shared/modules.mjs'
 
 var pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
diff --git a/util/sdk/macros/index.mjs b/util/sdk/macros/index.mjs
index 62d65f63..2bee7575 100644
--- a/util/sdk/macros/index.mjs
+++ b/util/sdk/macros/index.mjs
@@ -236,21 +236,21 @@ const generateMacros = templates => obj => {
 }
 
 const insertAggregateMacrosOnly = (fContents = '', aggregateMacros = {}) => {
-  fContents = fContents.replace(/[ \t]*\/\* \$\{EXPORTS\} \*\/[ \t]*\n/, aggregateMacros.exports)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{MOCK_IMPORTS\} \*\/[ \t]*\n/, aggregateMacros.mockImports)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{MOCK_OBJECTS\} \*\/[ \t]*\n/, aggregateMacros.mockObjects)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{EXPORTS\} \*\/[ \t\r]*\n/, aggregateMacros.exports)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{MOCK_IMPORTS\} \*\/[ \t\r]*\n/, aggregateMacros.mockImports)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{MOCK_OBJECTS\} \*\/[ \t\r]*\n/, aggregateMacros.mockObjects)
   return fContents
 }
 
 const insertMacros = (fContents = '', macros = {}, module = {}, version = {}) => {
-  fContents = fContents.replace(/[ \t]*\/\* \$\{METHODS\} \*\/[ \t]*\n/, macros.methods)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{METHOD_LIST\} \*\/[ \t]*\n/, macros.methodList)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{ENUMS\} \*\/[ \t]*\n/, macros.enums)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{EVENTS\} \*\/[ \t]*\n/, macros.events)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{IMPORTS\} \*\/[ \t]*\n/, macros.imports)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{INITIALIZATION\} \*\/[ \t]*\n/, macros.initialization)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{DEFAULTS\} \*\/[ \t]*\n/, macros.defaults)
-  fContents = fContents.replace(/[ \t]*\/\* \$\{EVENT_METHODS\} \*\/[ \t]*\n/, macros.onlyEventMethods)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{METHODS\} \*\/[ \t\r]*\n/, macros.methods)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{METHOD_LIST\} \*\/[ \t\r]*\n/, macros.methodList)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{ENUMS\} \*\/[ \t\r]*\n/, macros.enums)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{EVENTS\} \*\/[ \t\r]*\n/, macros.events)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{IMPORTS\} \*\/[ \t\r]*\n/, macros.imports)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{INITIALIZATION\} \*\/[ \t\r]*\n/, macros.initialization)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{DEFAULTS\} \*\/[ \t\r]*\n/, macros.defaults)
+  fContents = fContents.replace(/[ \t]*\/\* \$\{EVENT_METHODS\} \*\/[ \t\r]*\n/, macros.onlyEventMethods)
   fContents = fContents.replace(/\$\{readable\}/g, version.readable)
   fContents = fContents.replace(/\$\{major\}/g, version.major)
   fContents = fContents.replace(/\$\{minor\}/g, version.minor)