diff --git a/client/coral-admin/src/routes/Community/components/ActionButton.js b/client/coral-admin/src/routes/Community/components/ActionButton.js
index 400b59ab3..0ef9b8a39 100644
--- a/client/coral-admin/src/routes/Community/components/ActionButton.js
+++ b/client/coral-admin/src/routes/Community/components/ActionButton.js
@@ -5,6 +5,7 @@ import {menuActionsMap} from '../../../utils/moderationQueueActionsMap';
 
 import t from 'coral-framework/services/i18n';
 
+// TODO: Needs refactoring.
 const ActionButton = ({type = '', user, ...props}) => {
   return (
     <Button
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.js b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
index 1e36c45a2..5b2238592 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedUser.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
@@ -2,13 +2,17 @@ import React from 'react';
 import styles from './FlaggedUser.css';
 
 import ActionButton from './ActionButton';
+
+// TODO: Should not rely on plugin.
 import {username} from 'talk-plugin-flags/helpers/flagReasons';
+
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 
 import cn from 'classnames';
 import t from 'coral-framework/services/i18n';
 
+// TODO: Should work with custom flags too.
 const shortReasons = {
   [username.other]: t('community.other'),
   [username.spam]: t('community.spam_ads'),