diff --git a/includes/simplenews.admin.inc b/includes/simplenews.admin.inc
index 6bb4320..0cbac3a 100644
--- a/includes/simplenews.admin.inc
+++ b/includes/simplenews.admin.inc
@@ -1308,7 +1308,6 @@ function simplenews_admin_settings($form, &$form_state) {
     '#title' => t('Newsletter category field'),
     '#options' =>  $field_options,
     '#required' => TRUE,
-    '#description' => t('@todo'),
     '#default_value' => variable_get('simplenews_category_field', 'field_simplenews_term'),
   );
 
diff --git a/includes/simplenews.subscription.inc b/includes/simplenews.subscription.inc
index e11ed3b..958501a 100644
--- a/includes/simplenews.subscription.inc
+++ b/includes/simplenews.subscription.inc
@@ -163,7 +163,6 @@ function simplenews_confirm_subscription() {
  * Generate the confirm subscription form.
  *
  * @see simplenews_confirm_add_form_submit()
- * @todo Add $form to drupal_get_form() callback functions: http://drupal.org/node/224333#hook_forms_signature
  */
 function simplenews_confirm_add_form($form, &$form_state, $mail, $newsletter) {
   $form = array();
@@ -203,7 +202,6 @@ function simplenews_confirm_add_form_submit($form, &$form_state) {
  * Generate the confirm unsubscription form.
  *
  * @see simplenews_confirm_removal_form_submit()
- * @todo Add $form to drupal_get_form() callback functions: http://drupal.org/node/224333#hook_forms_signature
  */
 function simplenews_confirm_removal_form($form, &$form_state, $mail, $newsletter) {
   $form = array();
diff --git a/simplenews.module b/simplenews.module
index 3793db4..b31ad64 100644
--- a/simplenews.module
+++ b/simplenews.module
@@ -82,33 +82,26 @@ define('SIMPLENEWS_OPT_INOUT_DOUBLE', 'double');
 /**
  * Implementation of hook_permission().
  *
- * @todo Change array format and add titles where required: http://drupal.org/node/224333#descriptions_permissions
  * @todo Change sort order where required: http://drupal.org/node/224333#sorting_permissions
  * @todo Review the use of 'administer nodes': http://drupal.org/node/224333#bypass_node_access
- * @todo hook_perm() renamed: http://drupal.org/node/224333#hook_permission
  */
 function simplenews_permission() {
   return array(
     // @todo Change to administer newsletter categories. And update existing permissions in hook_update_N.
     'administer newsletters' => array(
-      'title' => t('administer newsletters'),
-      'description' => t('@todo Add a description for administer newsletters'),
+      'title' => t('Administer newsletters'),
     ),
     'administer simplenews subscriptions' => array(
-      'title' => t('administer simplenews subscriptions'),
-      'description' => t('@todo Add a description for administer simplenews subscriptions'),
+      'title' => t('Administer simplenews subscriptions'),
     ),
     'administer simplenews settings' => array(
-      'title' => t('administer simplenews settings'),
-      'description' => t('@todo Add a description for administer simplenews settings'),
+      'title' => t('Administer simplenews settings'),
     ),
     'send newsletter' => array(
-      'title' => t('send newsletter'),
-      'description' => t('@todo Add a description for send newsletter'),
+      'title' => t('Send newsletter'),
     ),
     'subscribe to newsletters' => array(
-      'title' => t('subscribe to newsletters'),
-      'description' => t('@todo Add a description for subscribe/unsubscribe to newsletters'),
+      'title' => t('Subscribe to newsletters'),
     ),
   );
 }
@@ -1810,7 +1803,6 @@ function simplenews_recent_newsletters($tid, $count = 5) {
  *
  * @see simplenews_block_form_validate()
  * @see simplenews_block_form_submit()
- * @todo Add $form to drupal_get_form() callback functions.
  * @see http://drupal.org/node/224333#hook_forms_signature
  */
 function simplenews_block_form($form, &$form_state, $tid) {
@@ -2499,19 +2491,17 @@ function _simplenews_get_token_info($modules) {
  * Implementation of hook_token_info().
  */
 function simplenews_token_info() {
+  // @todo Add desription to the types and extend available tokens.
   $types['simplenews-subscriber'] = array(
     'name' => t('Simplenews subscriber'),
-    'description' => t('@todo .'),
     'needs-data' => 'account',
   );
   $types['simplenews-newsletter'] = array(
     'name' => t('Simplenews newsletter'),
-    'description' => t('@todo .'),
     'needs-data' => 'node',
   );
   $types['simplenews-category'] = array(
     'name' => t('Simplenews newsletter category'),
-    'description' => t('@todo .'),
     'needs-data' => 'category',
   );