diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index f614ff28..7f6b1994 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -124,38 +124,6 @@ const HPTCAT = {
   'mining': ['ml', 'scl', 'sdm', 'abl'],
 };
 
-const INTCAT = {
-  'auto field-maintenance unit': ['am'] ,
-  'cargo racks': ['cr', 'crl'],
-  'fsd interdictor': ['fi'],
-  'fuel': ['ft', 'fs'],
-  'hangars': ['fh', 'pv'],
-  'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl', 'mlc'],
-  'passenger cabins': ['pce', 'pci', 'pcm', 'pcq'],
-  'refineries': ['rf'],
-  'shields': ['sg', 'bsg', 'psg', 'scb'],
-  'structural reinforcement': ['hr', 'mrp'],
-  // Assists
-  'flight assists': ['dc', 'sua'],
-  // Scanners
-  'scanners': ['ss'],
-  // Experimental
-  'experimental': ['rcpl', 'dtl', 'mahr', 'rsl'],
-  // Stabilizers
-  'weapon stabilizers': ['ews'],
-  // Guardian
-  'guardian': ['gsrp', 'gfsb', 'ghrp', 'gmrp'],
-}
-
-const HPTCAT = {
-  'lasers': ['pl', 'ul', 'bl'],
-  'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
-  'ordnance': ['mr', 'amr', 'tp', 'nl'],
-  'mining': ['ml', 'scl', 'sdm', 'abl'],
-  'experimental': ['axmc', 'axmce', 'axmr', 'axmre', 'ntp','rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn'],
-  'guardian': ['gpc', 'ggc', 'gsc'],
-}
-
 /**
  * Available modules menu
  */
diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
index 55871764..5ac1ecf0 100644
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -123,16 +123,6 @@ export default class HardpointSlot extends Slot {
         }
       }
 
-      let cgmod = null;
-      let cgttip = '';
-      if (m.preEngineered && m.preEngineered.availability === 'CG') {
-        cgmod = <CommunityGoalSmall className={'community'}/>;
-        cgttip = 'CG module';
-      }else if (m.preEngineered && typeof(m.preEngineered.availability) === 'undefined') {
-        cgmod = <TechBrokerSmall className={'technomargin'}/>;
-        cgttip = 'Tech Broker module';
-      }
-
       let cgttip = '';
       // Get availability icon (CG, Tech Broker, or PowerPlay)
       const availabilityIcon = this._getAvailabilityIcon(m);
diff --git a/src/app/components/Header.jsx b/src/app/components/Header.jsx
index b32ca833..37e8f3e0 100644
--- a/src/app/components/Header.jsx
+++ b/src/app/components/Header.jsx
@@ -439,7 +439,6 @@ export default class Header extends TranslatedComponent {
     let tips = Persist.showTooltips();
     let promptCG = Persist.promptCGModules();
     let moduleResistances = Persist.showModuleResistances();
-    let promptCG = Persist.promptCG();
 
     return (
       <div className='menu-list no-wrap cap' onClick={ (e) => e.stopPropagation() }>
diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx
index e380b4b6..9c77c52a 100644
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -2,11 +2,10 @@ import React from 'react';
 import cn from 'classnames';
 import Slot from './Slot';
 import Persist from '../stores/Persist';
-import { ListModifications, Modified, CommunityGoalSmall, TechBrokerSmall } from './SvgIcons';
+import { ListModifications, Modified, CommunityGoalSmall, TechBrokerSmall, PowerPlaySmall } from './SvgIcons';
 import { Modifications } from 'coriolis-data/dist';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import { blueprintTooltip } from '../utils/BlueprintFunctions';
-import { CommunityGoalSmall, TechBrokerSmall, PowerPlaySmall } from './SvgIcons';
 
 /**
  * Internal Slot
@@ -104,11 +103,15 @@ export default class InternalSlot extends Slot {
       else if (availabilityIcon && availabilityIcon === <CommunityGoalSmall className='community' />) {
         cgttip = 'Community Goal Module';
       }
+      else if (availabilityIcon && availabilityIcon === <TechBrokerSmall className='techbroker' />) {
+        cgttip = 'Tech Broker Module';
+      }
+      else if (availabilityIcon && availabilityIcon === <CommunityGoalSmall className='community' />) {
+        cgttip = 'Community Goal Module';
+      }
 
       let mass = m.getMass() || m.cargo || m.fuel || 0;
-
       const className = cn('details', enabled ? '' : 'disabled');
-      let mass = m.getMass() || m.cargo || m.fuel || 0;
 
       return <div className={className} draggable='true' onDragStart={drag} onDragEnd={drop}>
         <div className={'cb'}>
diff --git a/src/app/components/InternalSlotSection.jsx b/src/app/components/InternalSlotSection.jsx
index 28b29199..07442a61 100644
--- a/src/app/components/InternalSlotSection.jsx
+++ b/src/app/components/InternalSlotSection.jsx
@@ -242,7 +242,6 @@ export default class InternalSlotSection extends SlotSection {
         eligible={s.eligible}
         slot={s}
         m={s.m}
-        menu={menu}
         drag={this._drag.bind(this, s)}
         dragOver={this._dragOverSlot.bind(this, s)}
         drop={this._drop}
diff --git a/src/app/pages/ErrorDetails.jsx b/src/app/pages/ErrorDetails.jsx
index d6d8c8ef..942ad69d 100644
--- a/src/app/pages/ErrorDetails.jsx
+++ b/src/app/pages/ErrorDetails.jsx
@@ -32,7 +32,7 @@ export default class ErrorDetails extends React.Component {
         </div>
         <div style={{ marginTop: '2em' }}>
           <div><span className='warning'>Browser:</span> {window.navigator.userAgent}</div>
-          <div><span className='warning'>Path:</span> {this.context.route.canonicalPath}</div>
+          <div><span className='warning'>Path:</span> {this.context.route && this.context.route.canonicalPath ? this.context.route.canonicalPath : 'Unknown'}</div>
           <div><span className='warning'>Error:</span> {ed["error"] || 'Unknown'}</div>
           <div className='warning'>Details:</div>
           <div><pre>{typeof ed == 'object' ? Object.keys(ed).map((e) => `${e}: ${ed[e]}\n`) : ed}</pre></div>