diff --git a/client/src/components/ElementActions/SaveAction.js b/client/src/components/ElementActions/SaveAction.js
index d4bee1a4..8b80a8d3 100644
--- a/client/src/components/ElementActions/SaveAction.js
+++ b/client/src/components/ElementActions/SaveAction.js
@@ -49,8 +49,6 @@ const SaveAction = (MenuComponent) => (props) => {
         // Update the Apollo query cache with the new form data
         const { apolloClient } = window.ss;
 
-        // @todo optimistically update the data for the current element instead of
-        // rerunning the whole query
         apolloClient.queryManager.reFetchObservableQueries();
         reinitialiseForm(formData);
 
diff --git a/client/src/components/ElementEditor/AddElementPopover.js b/client/src/components/ElementEditor/AddElementPopover.js
index 2a1ebff6..cb6cb312 100644
--- a/client/src/components/ElementEditor/AddElementPopover.js
+++ b/client/src/components/ElementEditor/AddElementPopover.js
@@ -31,7 +31,6 @@ class AddElementPopover extends Component {
       } = this.props;
 
       event.preventDefault();
-      // TODO This should probably use the GraphQL element type name (element.__typeName)
       handleAddElementToArea(elementType.class, insertAfterElement).then(
         () => {
           const preview = window.jQuery('.cms-preview');
diff --git a/client/src/components/ElementEditor/ElementList.js b/client/src/components/ElementEditor/ElementList.js
index 51865602..8d462a07 100644
--- a/client/src/components/ElementEditor/ElementList.js
+++ b/client/src/components/ElementEditor/ElementList.js
@@ -121,7 +121,6 @@ class ElementList extends Component {
 }
 
 ElementList.propTypes = {
-  // @todo support either ElementList or Element children in an array (or both)
   blocks: PropTypes.arrayOf(elementType),
   elementTypes: PropTypes.arrayOf(elementTypeType).isRequired,
   allowedElementTypes: PropTypes.arrayOf(elementTypeType).isRequired,
diff --git a/src/Forms/ElementalAreaField.php b/src/Forms/ElementalAreaField.php
index ffc00936..eb95ddb2 100644
--- a/src/Forms/ElementalAreaField.php
+++ b/src/Forms/ElementalAreaField.php
@@ -162,11 +162,9 @@ protected function getReadOnlyBlockReducer()
                     'ElementType' => $element->getType(),
                     'ElementIcon' => $element->config()->get('icon'),
                     'ElementTitle' => $element->Title,
-                    // @todo: Change this to block history permalink when that functionality becomes available.
                     'ElementEditLink' => Controller::join_links(
                         // Always get the edit link for the block directly, not the in-line edit form if supported
                         $element->CMSEditLink(true),
-                        // @todo make this auto-permalinking work somehow
                         '#Root_History'
                     ),
                 ],