diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 679699c94..3cc13174a 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -108,7 +108,6 @@ class Comment extends React.Component {
     const flag = getActionSummary('FlagActionSummary', comment);
     const dontagree = getActionSummary('DontAgreeActionSummary', comment);
 
-    // @TODO(bengo) Would be best to only create these funcs on prop change
     const addBestTag = () => addCommentTag({
       id: comment.id,
       tag: BEST_TAG,
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 50a0820d1..ff45beafa 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -89,10 +89,7 @@ export class BestButton extends Component {
   }
 
   render() {
-
-    // @TODO(bengo) Consider adding the comment__action classes to other buttons to add cursor:pointer and never wrap the icons
-    // @TODO(bengo) Should I reuse another element like coral-ui button? Just doing what LikeButton does for now
-    // Oh. I think that's styled for the admin. Don't use coral-ui button until the whole comment bottom bar does.
+    // @TODO(bengo) Consider adding the comment__action--cursor-pointer to all buttons to add cursor:pointer and never wrap the icons
     const {isBest, addBest, removeBest} = this.props;
     const {isSaving} = this.state;
     const disabled = isSaving || ! (isBest ? removeBest : addBest);