diff --git a/plugins/talk-plugin-featured-comments/client/components/Tab.js b/plugins/talk-plugin-featured-comments/client/components/Tab.js
index 6e4a2d382..83232149a 100644
--- a/plugins/talk-plugin-featured-comments/client/components/Tab.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Tab.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {TabCount} from 'plugin-api/beta/client/components/ui';
 import InfoIcon from './InfoIcon';
 import {t} from 'plugin-api/beta/client/services';
-import Tooltip from '../containers/Tooltip';
+import Tooltip from './Tooltip';
 
 export default ({active, asset: {featuredCommentsCount}, tooltip, ...props}) => { 
   return (
@@ -12,7 +12,7 @@ export default ({active, asset: {featuredCommentsCount}, tooltip, ...props}) =>
       {t('talk-plugin-featured-comments.featured')}
       <TabCount active={active} sub>{featuredCommentsCount}</TabCount>
       <InfoIcon /> 
-       {tooltip && <Tooltip />} 
+      {tooltip && <Tooltip />} 
     </span>
   );
 };
\ No newline at end of file
diff --git a/plugins/talk-plugin-featured-comments/client/components/Tooltip.js b/plugins/talk-plugin-featured-comments/client/components/Tooltip.js
index a45ee118b..8863e87ab 100644
--- a/plugins/talk-plugin-featured-comments/client/components/Tooltip.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Tooltip.js
@@ -2,16 +2,12 @@ import React from 'react';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 import styles from './Tooltip.css';
 
-export default class Tooltip extends React.Component {
-  render() {
-    return (
-      <div className={styles.tooltip}>
-        <Icon name="info_outline" className={styles.icon} />
-        <h3 className={styles.headline}>Featured Comments:</h3>
-        <p className={styles.description}>
-          Comments selected by our team as worth reading
-        </p>
-      </div>
-    );
-  }
-}
+export default () => (
+  <div className={styles.tooltip}>
+    <Icon name="info_outline" className={styles.icon} />
+    <h3 className={styles.headline}>Featured Comments:</h3>
+    <p className={styles.description}>
+      Comments selected by our team as worth reading
+    </p>
+  </div>
+);
diff --git a/plugins/talk-plugin-featured-comments/client/containers/Tooltip.js b/plugins/talk-plugin-featured-comments/client/containers/Tooltip.js
deleted file mode 100644
index 34cc31a73..000000000
--- a/plugins/talk-plugin-featured-comments/client/containers/Tooltip.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {bindActionCreators} from 'redux';
-import {showTooltip, hideTooltip} from '../actions';
-import {connect} from 'plugin-api/beta/client/hocs';
-import Tooltip from '../components/Tooltip';
-
-const mapStateToProps = ({talkPluginFeaturedComments: state}) => state;
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({
-    showTooltip,
-    hideTooltip,
-  }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Tooltip);