diff --git a/log-viewer/modules/parsers/ApexLogParser.ts b/log-viewer/modules/parsers/ApexLogParser.ts
index 9d5543f8..c0461ee8 100644
--- a/log-viewer/modules/parsers/ApexLogParser.ts
+++ b/log-viewer/modules/parsers/ApexLogParser.ts
@@ -989,7 +989,6 @@ export class MethodEntryLine extends Method {
     if (this.text.indexOf('System.Type.forName(') !== -1) {
       // assume we are not charged for class loading (or at least not lengthy remote-loading / compiling)
       this.cpuType = 'loading';
-      // this.namespace = 'default';
     } else {
       const methodNameParts = parts[4]?.split('.') ?? '';
       const possibleNs = methodNameParts[0] ?? '';
@@ -1218,8 +1217,6 @@ class VFFormulaEndLine extends LogLine {
 }
 
 class VFSeralizeViewStateStartLine extends Method {
-  namespace = 'system';
-
   constructor(parts: string[]) {
     super(parts, ['VF_SERIALIZE_VIEWSTATE_END'], 'System Method', 'method');
   }
@@ -1426,6 +1423,7 @@ class UserDebugLine extends LogLine {
 }
 
 class CumulativeLimitUsageLine extends Method {
+  namespace = 'default';
   constructor(parts: string[]) {
     super(parts, ['CUMULATIVE_LIMIT_USAGE_END'], 'System Method', 'system');
   }
@@ -1433,6 +1431,7 @@ class CumulativeLimitUsageLine extends Method {
 
 class CumulativeProfilingLine extends LogLine {
   acceptsText = true;
+  namespace = 'default';
   constructor(parts: string[]) {
     super(parts);
     this.text = parts[2] + ' ' + (parts[3] ?? '');
@@ -1440,12 +1439,14 @@ class CumulativeProfilingLine extends LogLine {
 }
 
 class CumulativeProfilingBeginLine extends Method {
+  namespace = 'default';
   constructor(parts: string[]) {
     super(parts, ['CUMULATIVE_PROFILING_END'], 'System Method', 'custom');
   }
 }
 
 class LimitUsageLine extends LogLine {
+  namespace = 'default';
   constructor(parts: string[]) {
     super(parts);
     this.lineNumber = this.parseLineNumber(parts[2]);
@@ -1455,6 +1456,7 @@ class LimitUsageLine extends LogLine {
 
 class LimitUsageForNSLine extends LogLine {
   acceptsText = true;
+  namespace = 'default';
 
   constructor(parts: string[]) {
     super(parts);
@@ -1525,8 +1527,6 @@ class NBAStrategyError extends LogLine {
 }
 
 class PushTraceFlagsLine extends LogLine {
-  namespace = 'system';
-
   constructor(parts: string[]) {
     super(parts);
     this.lineNumber = this.parseLineNumber(parts[2]);
@@ -1535,8 +1535,6 @@ class PushTraceFlagsLine extends LogLine {
 }
 
 class PopTraceFlagsLine extends LogLine {
-  namespace = 'system';
-
   constructor(parts: string[]) {
     super(parts);
     this.lineNumber = this.parseLineNumber(parts[2]);